@fdm-monster/server 1.8.1 → 1.8.3

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.
Files changed (115) hide show
  1. package/.yarn/install-state.gz +0 -0
  2. package/.yarn/releases/{yarn-4.5.3.cjs → yarn-4.7.0.cjs} +256 -255
  3. package/.yarnrc.yml +1 -1
  4. package/README.md +14 -4
  5. package/RELEASE_NOTES.MD +35 -4
  6. package/dist/consoles/http-file-receiver.console.js +81 -0
  7. package/dist/consoles/http-file-receiver.console.js.map +1 -0
  8. package/dist/constants/event.constants.js +8 -0
  9. package/dist/constants/event.constants.js.map +1 -1
  10. package/dist/container.js +2 -14
  11. package/dist/container.js.map +1 -1
  12. package/dist/container.tokens.js +1 -3
  13. package/dist/container.tokens.js.map +1 -1
  14. package/dist/controllers/plugin-firmware-update.controller.js +4 -6
  15. package/dist/controllers/plugin-firmware-update.controller.js.map +1 -1
  16. package/dist/controllers/printer-files.controller.js +19 -22
  17. package/dist/controllers/printer-files.controller.js.map +1 -1
  18. package/dist/controllers/printer-settings.controller.js +3 -3
  19. package/dist/controllers/printer-settings.controller.js.map +1 -1
  20. package/dist/controllers/printer.controller.js +14 -8
  21. package/dist/controllers/printer.controller.js.map +1 -1
  22. package/dist/controllers/server-private.controller.js +2 -16
  23. package/dist/controllers/server-private.controller.js.map +1 -1
  24. package/dist/controllers/server-public.controller.js +0 -2
  25. package/dist/controllers/server-public.controller.js.map +1 -1
  26. package/dist/handlers/validators.js +9 -6
  27. package/dist/handlers/validators.js.map +1 -1
  28. package/dist/server.constants.js +1 -2
  29. package/dist/server.constants.js.map +1 -1
  30. package/dist/server.env.js +3 -25
  31. package/dist/server.env.js.map +1 -1
  32. package/dist/server.host.js +3 -1
  33. package/dist/server.host.js.map +1 -1
  34. package/dist/services/core/http-client.factory.js +40 -0
  35. package/dist/services/core/http-client.factory.js.map +1 -0
  36. package/dist/services/core/logs-manager.service.js +4 -3
  37. package/dist/services/core/logs-manager.service.js.map +1 -1
  38. package/dist/services/core/multer.service.js +72 -22
  39. package/dist/services/core/multer.service.js.map +1 -1
  40. package/dist/services/interfaces/file-upload-tracker.interface.js +6 -0
  41. package/dist/services/interfaces/file-upload-tracker.interface.js.map +1 -0
  42. package/dist/services/interfaces/printer.dto.js +6 -0
  43. package/dist/services/interfaces/printer.dto.js.map +1 -1
  44. package/dist/services/mongoose/printer.service.js +10 -3
  45. package/dist/services/mongoose/printer.service.js.map +1 -1
  46. package/dist/services/moonraker/moonraker-websocket.adapter.js +6 -2
  47. package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
  48. package/dist/services/moonraker/moonraker.client.js +196 -156
  49. package/dist/services/moonraker/moonraker.client.js.map +1 -1
  50. package/dist/services/octoprint/dto/plugin.dto.js +6 -0
  51. package/dist/services/octoprint/dto/plugin.dto.js.map +1 -0
  52. package/dist/services/octoprint/octoprint-api.routes.js +0 -61
  53. package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
  54. package/dist/services/octoprint/octoprint-websocket.adapter.js +11 -5
  55. package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
  56. package/dist/services/octoprint/octoprint.client.js +118 -201
  57. package/dist/services/octoprint/octoprint.client.js.map +1 -1
  58. package/dist/services/octoprint/plugin-base.service.js +15 -15
  59. package/dist/services/octoprint/plugin-base.service.js.map +1 -1
  60. package/dist/services/octoprint/plugin-firmware-update.service.js +1 -1
  61. package/dist/services/octoprint/plugin-firmware-update.service.js.map +1 -1
  62. package/dist/services/octoprint/plugin-repository.cache.js +2 -1
  63. package/dist/services/octoprint/plugin-repository.cache.js.map +1 -1
  64. package/dist/services/octoprint/utils/octoprint-http-client.builder.js +31 -0
  65. package/dist/services/octoprint/utils/octoprint-http-client.builder.js.map +1 -0
  66. package/dist/services/octoprint.api.js +6 -4
  67. package/dist/services/octoprint.api.js.map +1 -1
  68. package/dist/services/orm/printer.service.js +8 -3
  69. package/dist/services/orm/printer.service.js.map +1 -1
  70. package/dist/shared/default-http-client.builder.js +94 -0
  71. package/dist/shared/default-http-client.builder.js.map +1 -0
  72. package/dist/shared/websocket.adapter.js.map +1 -1
  73. package/dist/state/file-upload-tracker.cache.js +30 -40
  74. package/dist/state/file-upload-tracker.cache.js.map +1 -1
  75. package/dist/state/settings.store.js +4 -1
  76. package/dist/state/settings.store.js.map +1 -1
  77. package/dist/state/test-printer-socket.store.js.map +1 -1
  78. package/dist/state/validation/create-test-printer.validation.js +1 -0
  79. package/dist/state/validation/create-test-printer.validation.js.map +1 -1
  80. package/dist/tasks/boot.task.js +1 -2
  81. package/dist/tasks/boot.task.js.map +1 -1
  82. package/dist/tasks/printer-websocket-restore.task.js +1 -1
  83. package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
  84. package/dist/tasks/socketio.task.js +2 -2
  85. package/dist/tasks/socketio.task.js.map +1 -1
  86. package/dist/tasks.js.map +1 -1
  87. package/dist/utils/env.utils.js +0 -42
  88. package/dist/utils/env.utils.js.map +1 -1
  89. package/dist/utils/normalize-url.js +3 -1
  90. package/dist/utils/normalize-url.js.map +1 -1
  91. package/dist/utils/pretty-print.utils.js +1 -1
  92. package/dist/utils/pretty-print.utils.js.map +1 -1
  93. package/dist/utils/url.utils.js +12 -14
  94. package/dist/utils/url.utils.js.map +1 -1
  95. package/package.json +40 -55
  96. package/dist/services/core/server-update.service.js +0 -71
  97. package/dist/services/core/server-update.service.js.map +0 -1
  98. package/requests/moonraker/api_job.http +0 -5
  99. package/requests/moonraker/api_printer.http +0 -5
  100. package/requests/moonraker/api_settings.http +0 -5
  101. package/requests/moonraker/printer_info.http +0 -5
  102. package/requests/moonraker/printer_objects_list.http +0 -6
  103. package/requests/moonraker/printer_objects_pause_resume.http +0 -6
  104. package/requests/moonraker/printer_objects_print_stats.http +0 -6
  105. package/requests/moonraker/printer_objects_webhooks.http +0 -6
  106. package/requests/moonraker/server_info.http +0 -5
  107. package/requests/octoprint/octoprint-api-printer-current.http +0 -7
  108. package/requests/octoprint/octoprint-pluginmanager-plugins.http +0 -7
  109. package/requests/printer-file/get-partial-file-moonraker.http +0 -5
  110. package/requests/printer-file/get-thumbnails.http +0 -5
  111. package/requests/printer-file/reload-printer-thumbnails.http +0 -10
  112. package/requests/printer-file/testfile.gcode +0 -5665
  113. package/requests/printer-file/upload-file.http +0 -11
  114. package/requests/printer-file/upload-slicer-file.http +0 -11
  115. package/requests/printers/list.http +0 -5
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","isTypeOrmMode","settingsService","logger","settings","constructor","loggerFactory","isTypeormMode","name","getSettings","InternalServerException","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","experimentalMoonrakerSupport","experimentalTypeormSupport","experimentalClientSupport","experimentalThumbnailSupport","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","debugSettings","getDebugSettingsSensitive","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","updateCredentialSettings","jwtSecret","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","isThumbnailSupportEnabled","getServerSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","patchWizardSettings","wizardCompletedAt","Date","setRegistrationEnabled","patchServerSettings","getLoginRequired","setLoginRequired","updateServerSettings","serverSettings","updateTimeoutSettings","timeoutSettings","patchFileCleanSettings","fileClean","credentialSettings","patchCredentialSettings","setSentryDiagnosticsEnabled","setExperimentalMoonrakerSupport","moonrakerEnabled","setExperimentalThumbnailSupport","thumbnailsEnabled","setExperimentalClientSupport","experimentalClientEnabled","updateFrontendSettings","frontendSettings","sentryEnabled","log","isTestEnvironment","client","getCurrentHub","getClient","warn","getOptions","enabled"],"mappings":"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"}
1
+ {"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","isTypeOrmMode","settingsService","logger","settings","constructor","loggerFactory","isTypeormMode","name","getSettings","InternalServerException","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","experimentalMoonrakerSupport","experimentalTypeormSupport","experimentalClientSupport","experimentalThumbnailSupport","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","debugSettings","getDebugSettingsSensitive","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","updateCredentialSettings","jwtSecret","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","isThumbnailSupportEnabled","getServerSettings","getTimeoutSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","patchWizardSettings","wizardCompletedAt","Date","setRegistrationEnabled","patchServerSettings","getLoginRequired","setLoginRequired","updateServerSettings","serverSettings","updateTimeoutSettings","timeoutSettings","patchFileCleanSettings","fileClean","credentialSettings","patchCredentialSettings","setSentryDiagnosticsEnabled","setExperimentalMoonrakerSupport","moonrakerEnabled","setExperimentalThumbnailSupport","thumbnailsEnabled","setExperimentalClientSupport","experimentalClientEnabled","updateFrontendSettings","frontendSettings","sentryEnabled","log","isTestEnvironment","client","getClient","warn","getOptions","enabled"],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","socketIoGateway","socketFactory","eventEmitter2","logger","constructor","loggerFactory","name","setupTestPrinter","printer","close","validatedData","validateInput","createTestPrinterRules","enabled","correlationToken","createInstance","printerType","registerCredentials","printerId","loginDto","apiKey","printerURL","testEvents","octoPrintEvent","WsMessage","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","moonrakerEvent","listener","event","payload","send","forEach","te","on","log","setupSocketSession","promise","Promise","resolve","reject","open","startTime","setInterval","warn","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","e","error","errorSummary","captureException","disallowEmittingEvents","emit","printerEvents","printersDeleted","printerIds","off"],"mappings":"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"}
1
+ {"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","socketIoGateway","socketFactory","eventEmitter2","logger","constructor","loggerFactory","name","setupTestPrinter","printer","close","validatedData","validateInput","createTestPrinterRules","enabled","correlationToken","createInstance","printerType","registerCredentials","printerId","loginDto","apiKey","printerURL","testEvents","octoPrintEvent","WsMessage","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","moonrakerEvent","listener","event","payload","send","forEach","te","on","log","setupSocketSession","promise","Promise","resolve","reject","open","startTime","setInterval","warn","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","e","error","errorSummary","captureException","disallowEmittingEvents","emit","printerEvents","printersDeleted","printerIds","off"],"mappings":"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"}
@@ -11,6 +11,7 @@ Object.defineProperty(exports, "createTestPrinterRules", {
11
11
  const _serviceconstants = require("../../constants/service.constants");
12
12
  const _printerapiinterface = require("../../services/printer-api.interface");
13
13
  const createTestPrinterRules = {
14
+ enabled: "boolean",
14
15
  printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
15
16
  correlationToken: "required|string",
16
17
  apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.apiKeyLengthMaxDefault},${_serviceconstants.apiKeyLengthMinDefault}|alphaDash`,
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/state/validation/create-test-printer.validation.ts"],"names":["createTestPrinterRules","printerType","OctoprintType","MoonrakerType","correlationToken","apiKey","apiKeyLengthMaxDefault","apiKeyLengthMinDefault","printerURL"],"mappings":";;;;+BAGaA;;;eAAAA;;;kCAHkD;qCAClB;AAEtC,MAAMA,yBAAyB;IACpCC,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,kBAAkB;IAClBC,QAAQ,CAAC,uBAAuB,EAAEH,kCAAa,CAAC,QAAQ,EAAEI,wCAAsB,CAAC,CAAC,EAAEC,wCAAsB,CAAC,UAAU,CAAC;IACtHC,YAAY;AACd"}
1
+ {"version":3,"sources":["../../../src/state/validation/create-test-printer.validation.ts"],"names":["createTestPrinterRules","enabled","printerType","OctoprintType","MoonrakerType","correlationToken","apiKey","apiKeyLengthMaxDefault","apiKeyLengthMinDefault","printerURL"],"mappings":";;;;+BAGaA;;;eAAAA;;;kCAHkD;qCAClB;AAEtC,MAAMA,yBAAyB;IACpCC,SAAS;IACTC,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,kBAAkB;IAClBC,QAAQ,CAAC,uBAAuB,EAAEH,kCAAa,CAAC,QAAQ,EAAEI,wCAAsB,CAAC,CAAC,EAAEC,wCAAsB,CAAC,UAAU,CAAC;IACtHC,YAAY;AACd"}
@@ -73,7 +73,7 @@ class BootTask {
73
73
  isTypeormMode;
74
74
  typeormService;
75
75
  printerThumbnailCache;
76
- constructor({ loggerFactory, serverTasks, settingsService, settingsStore, multerService, printerSocketStore, printerFilesStore, permissionService, roleService, userService, taskManagerService, pluginRepositoryCache, floorStore, pluginFirmwareUpdateService, clientBundleService, configService, typeormService, isTypeormMode, printerThumbnailCache }){
76
+ constructor({ loggerFactory, serverTasks, settingsService, settingsStore, multerService, printerSocketStore, printerFilesStore, permissionService, roleService, userService, taskManagerService, pluginRepositoryCache, floorStore, clientBundleService, configService, typeormService, isTypeormMode, printerThumbnailCache }){
77
77
  this.isTypeormMode = isTypeormMode;
78
78
  this.logger = loggerFactory(BootTask.name);
79
79
  this.serverTasks = serverTasks;
@@ -88,7 +88,6 @@ class BootTask {
88
88
  this.taskManagerService = taskManagerService;
89
89
  this.pluginRepositoryCache = pluginRepositoryCache;
90
90
  this.floorStore = floorStore;
91
- this.pluginFirmwareUpdateService = pluginFirmwareUpdateService;
92
91
  this.clientBundleService = clientBundleService;
93
92
  this.configService = configService;
94
93
  this.typeormService = typeormService;
@@ -1 +1 @@
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","isTypeormMode","typeormService","printerThumbnailCache","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","loadCache","length","getAllValues","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","envUrl","fetchMongoDBConnectionString","connect","serverSelectionTimeoutMS","syncIndexes","runMigrations","connection","db","getClient"],"mappings":";;;;+BAwBaA;;;eAAAA;;;kEAxBkC;2BACa;iCACnC;iCACI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqBtB,MAAMA;IACXC,OAAsB;IACtBC,mBAAuC;IACvCC,YAAyB;IACzBC,cAA6B;IAC7BC,gBAAkC;IAClCC,cAA6B;IAC7BC,mBAAuC;IACvCC,kBAAqC;IACrCC,kBAAqC;IACrCC,YAAyB;IACzBC,YAAyB;IACzBC,sBAA6C;IAC7CC,WAAuB;IACvBC,4BAAyD;IACzDC,oBAAyC;IACzCC,cAA6B;IAC7BC,cAAuB;IACvBC,eAA+B;IAC/BC,sBAA6C;IAE7CC,YAAY,EACVC,aAAa,EACblB,WAAW,EACXE,eAAe,EACfD,aAAa,EACbE,aAAa,EACbC,kBAAkB,EAClBC,iBAAiB,EACjBC,iBAAiB,EACjBC,WAAW,EACXC,WAAW,EACXT,kBAAkB,EAClBU,qBAAqB,EACrBC,UAAU,EACVC,2BAA2B,EAC3BC,mBAAmB,EACnBC,aAAa,EACbE,cAAc,EACdD,aAAa,EACbE,qBAAqB,EAqBtB,CAAE;QACD,IAAI,CAACF,aAAa,GAAGA;QACrB,IAAI,CAAChB,MAAM,GAAGoB,cAAcrB,SAASsB,IAAI;QACzC,IAAI,CAACnB,WAAW,GAAGA;QACnB,IAAI,CAACE,eAAe,GAAGA;QACvB,IAAI,CAACD,aAAa,GAAGA;QACrB,IAAI,CAACE,aAAa,GAAGA;QACrB,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,iBAAiB,GAAGA;QACzB,IAAI,CAACC,iBAAiB,GAAGA;QACzB,IAAI,CAACC,WAAW,GAAGA;QACnB,IAAI,CAACC,WAAW,GAAGA;QACnB,IAAI,CAACT,kBAAkB,GAAGA;QAC1B,IAAI,CAACU,qBAAqB,GAAGA;QAC7B,IAAI,CAACC,UAAU,GAAGA;QAClB,IAAI,CAACC,2BAA2B,GAAGA;QACnC,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACE,cAAc,GAAGA;QACtB,IAAI,CAACC,qBAAqB,GAAGA;IAC/B;IAEA,MAAMI,UAAU;QAEd,IAAI,CAACrB,kBAAkB,CAACsB,iBAAiB,CAAC,IAAI,CAACrB,WAAW,CAACsB,gBAAgB;QAE3E,IAAI,CAACxB,MAAM,CAACyB,GAAG,CAAC;QAChB,MAAM,IAAI,CAACC,GAAG;IAChB;IAEA,MAAMA,MAAM;QACV,IAAI,IAAI,CAACV,aAAa,EAAE;YACtB,MAAM,IAAI,CAACC,cAAc,CAACU,gBAAgB;QAC5C,OAAO;YACL,IAAI;gBACF,MAAM,IAAI,CAACA,gBAAgB;gBAC3B,MAAM,IAAI,CAACC,eAAe;YAC5B,EAAE,OAAOC,GAAG;gBACV,IAAIA,aAAaC,iBAAQ,CAACC,KAAK,EAAE;oBAE/B,IAAI,CAACF,EAAEG,OAAO,CAACC,QAAQ,CAAC,sFAAsF;wBAE5G,IAAIJ,EAAEG,OAAO,CAACC,QAAQ,CAAC,iBAAiB;4BACtC,IAAI,CAACjC,MAAM,CAACkC,KAAK,CAAC;wBACpB,OAAO;4BACL,IAAI,CAAClC,MAAM,CAACkC,KAAK,CAAC,CAAC,2BAA2B,EAAEL,EAAEG,OAAO,EAAE;wBAC7D;wBACA,IAAI,CAAC/B,kBAAkB,CAACkC,mBAAmB,CAACC,yBAAQ,CAACC,QAAQ,EAAE;wBAC/D;oBACF;gBACF;YACF;QACF;QAEA,IAAI,CAACrC,MAAM,CAACyB,GAAG,CAAC;QAChB,MAAM,IAAI,CAACtB,aAAa,CAACmC,YAAY;QAErC,IAAI,CAACtC,MAAM,CAACyB,GAAG,CAAC;QAChB,MAAM,IAAI,CAACjB,iBAAiB,CAAC+B,eAAe;QAC5C,MAAM,IAAI,CAAC9B,WAAW,CAAC+B,SAAS;QAEhC,MAAMC,aAAa,IAAI,CAAC1B,aAAa,CAAC0B,UAAU;QAChD,IAAIA,YAAY;YACd,IAAI,CAACzC,MAAM,CAAC0C,IAAI,CAAC,CAAC,6BAA6B,EAAEC,6BAAY,CAACC,qBAAqB,EAAE;YACrF,MAAM,IAAI,CAACC,yBAAyB;YACpC,IAAI,CAAC7C,MAAM,CAAC0C,IAAI,CAAC,CAAC,yDAAyD,EAAEC,6BAAY,CAACC,qBAAqB,EAAE;YACjH,MAAM,IAAI,CAACzC,aAAa,CAAC2C,gBAAgB,CAAC;YAC1C,MAAM,IAAI,CAAC3C,aAAa,CAAC4C,sBAAsB,CAAC;QAClD,OAAO;YACL,MAAMC,gBAAgB,IAAI,CAACjC,aAAa,CAACkC,GAAG,CAACN,6BAAY,CAACO,uBAAuB,EAAE;YACnF,IAAIF,kBAAkB,MAAM;gBAC1B,IAAI,CAAChD,MAAM,CAAC0C,IAAI,CAAC,CAAC,8BAA8B,EAAEC,6BAAY,CAACO,uBAAuB,EAAE;gBACxF,MAAM,IAAI,CAAC/C,aAAa,CAAC2C,gBAAgB,CAACE,kBAAkB;YAC9D;YAEA,MAAMG,sBAAsB,IAAI,CAACpC,aAAa,CAACkC,GAAG,CAACN,6BAAY,CAACS,6BAA6B,EAAE;YAC/F,IAAID,wBAAwB,MAAM;gBAChC,IAAI,CAACnD,MAAM,CAAC0C,IAAI,CAAC,CAAC,oCAAoC,EAAEC,6BAAY,CAACS,6BAA6B,EAAE;gBACpG,MAAM,IAAI,CAACjD,aAAa,CAAC4C,sBAAsB,CAACI,wBAAwB;YAC1E;QACF;QAEA,MAAME,oBAAoB,IAAI,CAACtC,aAAa,CAACkC,GAAG,CAACN,6BAAY,CAACW,mBAAmB,EAAEC;QACnF,MAAMC,uBAAuB,IAAI,CAACzC,aAAa,CAACkC,GAAG,CAACN,6BAAY,CAACc,uBAAuB,EAAEF;QAC1F,MAAM,IAAI,CAACpD,aAAa,CAACuD,iCAAiC,CAACL,mBAAmBG;QAE9E,IAAI,CAACxD,MAAM,CAACyB,GAAG,CAAC;QAChB,IAAI,CAACpB,aAAa,CAACsD,kBAAkB;QACrC,IAAI,CAAC3D,MAAM,CAACyB,GAAG,CAAC;QAChB,MAAM,IAAI,CAACnB,kBAAkB,CAACsD,kBAAkB;QAChD,IAAI,CAAC5D,MAAM,CAACyB,GAAG,CAAC;QAChB,MAAM,IAAI,CAAClB,iBAAiB,CAACsD,cAAc;QAC3C,IAAI,CAAC7D,MAAM,CAACyB,GAAG,CAAC;QAChB,MAAM,IAAI,CAACb,UAAU,CAACkD,SAAS;QAC/B,IAAI,CAAC9D,MAAM,CAACyB,GAAG,CAAC;QAChB,MAAM,IAAI,CAACP,qBAAqB,CAAC6C,SAAS;QAC1C,MAAMC,SAAS,MAAM,IAAI,CAAC9C,qBAAqB,CAAC+C,YAAY;QAC5D,IAAI,CAACjE,MAAM,CAACyB,GAAG,CAAC,CAAC,OAAO,EAAEuC,OAAOA,MAAM,CAAC,aAAa,CAAC;QAEtD,IAAIE,QAAQC,GAAG,CAACC,gBAAgB,KAAK,QAAQ;YAC3C,IAAI,CAACpE,MAAM,CAAC0C,IAAI,CAAC;QACnB,OAAO;YACL,IAAI,CAACxC,WAAW,CAACmE,UAAU,CAACC,OAAO,CAAC,CAACC;gBACnC,IAAI,CAACtE,kBAAkB,CAACsB,iBAAiB,CAACgD;YAC5C;QACF;QAGA,IAAI,CAACtE,kBAAkB,CAACuE,UAAU,CAACpC,yBAAQ,CAACC,QAAQ,EAAE;IACxD;IAEA,MAAMQ,4BAA4B;QAChC,MAAM4B,eAAe,IAAI,CAAC1D,aAAa,CAACkC,GAAG,CAACN,6BAAY,CAAC+B,sBAAsB,EAAE/B,6BAAY,CAACgC,qBAAqB;QACnH,MAAMC,eAAe,IAAI,CAAC7D,aAAa,CAACkC,GAAG,CAACN,6BAAY,CAACkC,sBAAsB,EAAElC,6BAAY,CAACmC,qBAAqB;QACnH,MAAMC,WAAW,IAAI,CAAChE,aAAa,CAACkC,GAAG,CAACN,6BAAY,CAACqC,kBAAkB,EAAErC,6BAAY,CAACsC,iBAAiB;QACvG,MAAMC,YAAY,IAAI,CAACzE,WAAW,CAAC0E,aAAa,CAACJ;QAEjD,MAAMK,aAAa,MAAM,IAAI,CAAC1E,WAAW,CAAC2E,aAAa;QACvD,IAAI,CAACD,YAAY;YACf,MAAM,IAAI,CAAC1E,WAAW,CAAC4E,QAAQ,CAAC;gBAC9BC,UAAUd;gBACVe,UAAUZ;gBACVa,YAAY;gBACZC,YAAY;gBACZC,YAAY;gBACZC,qBAAqB;gBACrBC,OAAO;oBAACX,UAAUY,EAAE;iBAAC;YACvB;YACA,IAAI,CAAC9F,MAAM,CAACyB,GAAG,CAAC;QAClB,OAAO;YACL,MAAM,IAAI,CAACf,WAAW,CAACqF,eAAe,CAACX,YAAY;YACnD,MAAM,IAAI,CAAC1E,WAAW,CAACsF,iBAAiB,CAACZ,YAAY;YACrD,MAAM,IAAI,CAAC1E,WAAW,CAACuF,8BAA8B,CAACxB,cAAcG;YACpE,MAAM,IAAI,CAAClE,WAAW,CAACwF,cAAc,CAACd,YAAY;gBAACF,UAAUY,EAAE;aAAC;YAChE,IAAI,CAAC9F,MAAM,CAACyB,GAAG,CAAC;QAClB;IACF;IAEA,MAAME,mBAAmB;QACvB,IAAI,CAAC,IAAI,CAACX,aAAa,EAAE;YACvB,MAAMmF,SAASC,IAAAA,uCAA4B;YAC3C,MAAMC,IAAAA,iBAAO,EAACF,QAAQ;gBACpBG,0BAA0B;YAC5B;YACA,MAAMC,IAAAA,qBAAW;QACnB;IACF;IAEA,MAAM3E,kBAAkB;QACtB,IAAI,CAAC,IAAI,CAACZ,aAAa,EAAE;YACvB,MAAMwF,IAAAA,wBAAa,EAAC1E,iBAAQ,CAAC2E,UAAU,CAACC,EAAE,EAAE5E,iBAAQ,CAAC2E,UAAU,CAACE,SAAS;QAC3E;IACF;AACF"}
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","isTypeormMode","typeormService","printerThumbnailCache","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","loadCache","length","getAllValues","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","envUrl","fetchMongoDBConnectionString","connect","serverSelectionTimeoutMS","syncIndexes","runMigrations","connection","db","getClient"],"mappings":"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"}
@@ -49,7 +49,7 @@ class PrinterWebsocketRestoreTask {
49
49
  const result = await this.octoprintClient.getConnection(socket.login);
50
50
  silentSocketIds.push(socket.printerId);
51
51
  try {
52
- if (result?.current?.state !== "Closed") {
52
+ if (result.data?.current?.state !== "Closed") {
53
53
  this.logger.warn(`Silence was detected, but the OctoPrint current connection was not closed. Connection state ${result?.current?.state}`);
54
54
  }
55
55
  } catch (e) {
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/tasks/printer-websocket-restore.task.ts"],"names":["PrinterWebsocketRestoreTask","settingsStore","printerSocketStore","octoprintClient","logger","constructor","loggerFactory","name","run","startTime","Date","now","existingSockets","listPrinterSockets","resetAdapterIds","silentSocketIds","socket","printerType","OctoprintType","isClosedOrAborted","close","resetSocketState","warn","push","printerId","e","captureException","error","errorSummary","stack","apiState","API_STATE","unset","lastMessageReceivedTimestamp","result","getConnection","login","current","state","duration","getSettingsSensitive","server","debugSettings","debugSocketRetries","log","length"],"mappings":";;;;+BAUaA;;;eAAAA;;;4BAVgB;sBAMI;8BACP;qCACI;AAEvB,MAAMA;IACXC,cAA6B;IAC7BC,mBAAuC;IACvCC,gBAAiC;IACjCC,OAAsB;IAEtBC,YAAY,EACVH,kBAAkB,EAClBC,eAAe,EACfF,aAAa,EACbK,aAAa,EAMd,CAAE;QACD,IAAI,CAACJ,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACF,aAAa,GAAGA;QACrB,IAAI,CAACG,MAAM,GAAGE,cAAcN,4BAA4BO,IAAI;IAC9D;IAEA,MAAMC,MAAM;QACV,MAAMC,YAAYC,KAAKC,GAAG;QAE1B,MAAMC,kBAAkB,IAAI,CAACV,kBAAkB,CAACW,kBAAkB;QAClE,MAAMC,kBAAkB,EAAE;QAC1B,MAAMC,kBAAkB,EAAE;QAC1B,KAAK,MAAMC,UAAUJ,gBAAiB;YACpC,IAAII,OAAOC,WAAW,KAAKC,kCAAa,EAAE;gBACxC;YACF;YAEA,IAAI;gBACF,IAAIF,OAAOG,iBAAiB,IAAI;oBAC9BH,OAAOI,KAAK;oBACZJ,OAAOK,gBAAgB;oBACvB,IAAI,CAACjB,MAAM,CAACkB,IAAI,CAAC;oBACjBR,gBAAgBS,IAAI,CAACP,OAAOQ,SAAS;oBACrC;gBACF;YACF,EAAE,OAAOC,GAAQ;gBACfC,IAAAA,sBAAgB,EAACD;gBACjB,IAAI,CAACrB,MAAM,CAACuB,KAAK,CAAC,CAAC,0DAA0D,EAAEC,IAAAA,wBAAY,EAACH,GAAG,CAAC,CAAC,EAAEA,EAAEI,KAAK;gBAC1G;YACF;YAGA,IACE,AAACb,OAAOc,QAAQ,KAAKC,uBAAS,CAACC,KAAK,IAAI,CAAChB,OAAOiB,4BAA4B,IAC5EvB,KAAKC,GAAG,KAAKK,OAAOiB,4BAA4B,GAAG,KAAK,MACxD;gBACA,MAAMC,SAAS,MAAM,IAAI,CAAC/B,eAAe,CAACgC,aAAa,CAACnB,OAAOoB,KAAK;gBAEpErB,gBAAgBQ,IAAI,CAACP,OAAOQ,SAAS;gBAErC,IAAI;oBACF,IAAIU,QAAQG,SAASC,UAAU,UAAU;wBACvC,IAAI,CAAClC,MAAM,CAACkB,IAAI,CACd,CAAC,4FAA4F,EAAEY,QAAQG,SAASC,OAAO;oBAE3H;gBACF,EAAE,OAAOb,GAAG;oBACV,IAAI,CAACrB,MAAM,CAACuB,KAAK,CAAC,CAAC,sFAAsF,CAAC;gBAC5G;YACF;QACF;QAEA,MAAMY,WAAW7B,KAAKC,GAAG,KAAKF;QAC9B,IAAI,IAAI,CAACR,aAAa,CAACuC,oBAAoB,IAAIC,QAAQC,cAAcC,oBAAoB;YACvF,IAAI,CAACvC,MAAM,CAACwC,GAAG,CACb,CAAC,MAAM,EAAE9B,gBAAgB+B,MAAM,CAAC,qCAAqC,EAAE9B,gBAAgB8B,MAAM,CAAC,0BAA0B,EAAEN,SAAS,GAAG,CAAC;QAE3I;IACF;AACF"}
1
+ {"version":3,"sources":["../../src/tasks/printer-websocket-restore.task.ts"],"names":["PrinterWebsocketRestoreTask","settingsStore","printerSocketStore","octoprintClient","logger","constructor","loggerFactory","name","run","startTime","Date","now","existingSockets","listPrinterSockets","resetAdapterIds","silentSocketIds","socket","printerType","OctoprintType","isClosedOrAborted","close","resetSocketState","warn","push","printerId","e","captureException","error","errorSummary","stack","apiState","API_STATE","unset","lastMessageReceivedTimestamp","result","getConnection","login","data","current","state","duration","getSettingsSensitive","server","debugSettings","debugSocketRetries","log","length"],"mappings":";;;;+BAUaA;;;eAAAA;;;4BAVgB;sBAMI;8BACP;qCACI;AAEvB,MAAMA;IACXC,cAA6B;IAC7BC,mBAAuC;IACvCC,gBAAiC;IACjCC,OAAsB;IAEtBC,YAAY,EACVH,kBAAkB,EAClBC,eAAe,EACfF,aAAa,EACbK,aAAa,EAMd,CAAE;QACD,IAAI,CAACJ,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACF,aAAa,GAAGA;QACrB,IAAI,CAACG,MAAM,GAAGE,cAAcN,4BAA4BO,IAAI;IAC9D;IAEA,MAAMC,MAAM;QACV,MAAMC,YAAYC,KAAKC,GAAG;QAE1B,MAAMC,kBAAkB,IAAI,CAACV,kBAAkB,CAACW,kBAAkB;QAClE,MAAMC,kBAAkB,EAAE;QAC1B,MAAMC,kBAAkB,EAAE;QAC1B,KAAK,MAAMC,UAAUJ,gBAAiB;YACpC,IAAII,OAAOC,WAAW,KAAKC,kCAAa,EAAE;gBACxC;YACF;YAEA,IAAI;gBACF,IAAIF,OAAOG,iBAAiB,IAAI;oBAC9BH,OAAOI,KAAK;oBACZJ,OAAOK,gBAAgB;oBACvB,IAAI,CAACjB,MAAM,CAACkB,IAAI,CAAC;oBACjBR,gBAAgBS,IAAI,CAACP,OAAOQ,SAAS;oBACrC;gBACF;YACF,EAAE,OAAOC,GAAQ;gBACfC,IAAAA,sBAAgB,EAACD;gBACjB,IAAI,CAACrB,MAAM,CAACuB,KAAK,CAAC,CAAC,0DAA0D,EAAEC,IAAAA,wBAAY,EAACH,GAAG,CAAC,CAAC,EAAEA,EAAEI,KAAK;gBAC1G;YACF;YAGA,IACE,AAACb,OAAOc,QAAQ,KAAKC,uBAAS,CAACC,KAAK,IAAI,CAAChB,OAAOiB,4BAA4B,IAC5EvB,KAAKC,GAAG,KAAKK,OAAOiB,4BAA4B,GAAG,KAAK,MACxD;gBACA,MAAMC,SAAS,MAAM,IAAI,CAAC/B,eAAe,CAACgC,aAAa,CAACnB,OAAOoB,KAAK;gBAEpErB,gBAAgBQ,IAAI,CAACP,OAAOQ,SAAS;gBAErC,IAAI;oBACF,IAAIU,OAAOG,IAAI,EAAEC,SAASC,UAAU,UAAU;wBAC5C,IAAI,CAACnC,MAAM,CAACkB,IAAI,CACd,CAAC,4FAA4F,EAAEY,QAAQI,SAASC,OAAO;oBAE3H;gBACF,EAAE,OAAOd,GAAG;oBACV,IAAI,CAACrB,MAAM,CAACuB,KAAK,CAAC,CAAC,sFAAsF,CAAC;gBAC5G;YACF;QACF;QAEA,MAAMa,WAAW9B,KAAKC,GAAG,KAAKF;QAC9B,IAAI,IAAI,CAACR,aAAa,CAACwC,oBAAoB,IAAIC,QAAQC,cAAcC,oBAAoB;YACvF,IAAI,CAACxC,MAAM,CAACyC,GAAG,CACb,CAAC,MAAM,EAAE/B,gBAAgBgC,MAAM,CAAC,qCAAqC,EAAE/B,gBAAgB+B,MAAM,CAAC,0BAA0B,EAAEN,SAAS,GAAG,CAAC;QAE3I;IACF;AACF"}
@@ -47,7 +47,7 @@ class SocketIoTask {
47
47
  const printers = await this.printerCache.listCachedPrinters(true);
48
48
  const socketStates = this.printerSocketStore.getSocketStatesById();
49
49
  const printerEvents = await this.printerEventsCache.getAllKeyValues();
50
- const trackedUploads = this.fileUploadTrackerCache.getUploads(true);
50
+ const trackedUploads = this.fileUploadTrackerCache.getUploads();
51
51
  const socketIoData = {
52
52
  printers,
53
53
  floors,
@@ -64,7 +64,7 @@ class SocketIoTask {
64
64
  const serializedData = JSON.stringify(socketIoData);
65
65
  const transportDataSize = (0, _metricutils.sizeKB)(serializedData);
66
66
  this.updateAggregator(transportDataSize);
67
- this.socketIoGateway.send(_socketiogateway.IO_MESSAGES.LegacyUpdate, serializedData);
67
+ this.socketIoGateway.send(_socketiogateway.IO_MESSAGES.LegacyUpdate, socketIoData);
68
68
  }
69
69
  updateAggregator(transportDataLength) {
70
70
  if (this.aggregateSizeCounter >= this.aggregateWindowLength) {
@@ -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","getDebugSettingsSensitive","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;QAGA,IAAI,IAAI,CAACpB,aAAa,CAACuB,yBAAyB,IAAIC,wBAAwB;YAC1E,MAAMC,eAAeC,OAAOC,OAAO,CAACL,cACjCM,GAAG,CAAC,CAAC,CAACC,IAAIC,MAAM;gBACf,OAAO,GAAGD,GAAG,CAAC,EAAEE,IAAAA,qBAAQ,EAACD,QAAQ;YACnC,GACCE,IAAI,CAAC;YACR,IAAI,CAACjC,MAAM,CAACkC,GAAG,CAACR;QAClB;QAEA,MAAMS,iBAAiBC,KAAKC,SAAS,CAACd;QACtC,MAAMe,oBAAoBC,IAAAA,mBAAM,EAACJ;QACjC,IAAI,CAACK,gBAAgB,CAACF;QACtB,IAAI,CAAC7C,eAAe,CAACgD,IAAI,CAACC,4BAAW,CAACC,YAAY,EAAER;IACtD;IAEAK,iBAAiBI,mBAA2B,EAAE;QAC5C,IAAI,IAAI,CAAC1C,oBAAoB,IAAI,IAAI,CAACC,qBAAqB,EAAE;YAC3D,MAAM0C,oBAAoB,IAAI,CAACzC,cAAc,CAAC0C,MAAM,CAAC,CAACC,GAAGC,IAAOD,KAAKC;YACrE,MAAMC,qBAAqBJ,oBAAoB,IAAI,CAAC1C,qBAAqB;YACzE,IAAI,CAACH,MAAM,CAACkC,GAAG,CACb,CAAC,yBAAyB,EAAEe,mBAAmBC,OAAO,CAAC,IAAI,CAAC7C,QAAQ,EAAE,IAAI,EAAE,IAAI,CAACF,qBAAqB,CAAC,SAAS,CAAC;YAEnH,IAAI,CAACD,oBAAoB,GAAG;YAC5B,IAAI,CAACE,cAAc,GAAG,EAAE;QAC1B;QAEA,IAAI,CAACA,cAAc,CAAC+C,IAAI,CAACP;QACzB,EAAE,IAAI,CAAC1C,oBAAoB;IAC7B;AACF"}
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","getDebugSettingsSensitive","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.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","printerFileCleanTask","printerWebsocketTask","printerWebsocketRestoreTask"],"mappings":";;;;;;;;;;;IAsBaA,WAAW;eAAXA;;IAXGC,YAAY;eAAZA;;;6BAX0C;iCACjC;AAUlB,SAASA,aAAaC,IAAI,EAAEC,MAAoB,EAAEC,eAAe,CAAC,EAAEC,iBAAiB,KAAK;IAC/F,IAAIC,eAAe;QAAE,GAAGH,MAAM;IAAC;IAC/BG,aAAaF,YAAY,GAAGD,OAAOC,YAAY,IAAIA;IACnDE,aAAaD,cAAc,GAAGA,kBAAkB;IAChD,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;QAE1DnB,aAAaS,yBAAQ,CAACW,oBAAoB,EAAET,yBAAW,CAACM,OAAO,EAAE,KAAK,MAAM;QAE5EjB,aAAaS,yBAAQ,CAACY,oBAAoB,EAAEV,yBAAW,CAACQ,QAAQ,EAAE,MAAM;QAExEnB,aAAaS,yBAAQ,CAACa,2BAA2B,EAAEX,yBAAW,CAACQ,QAAQ,EAAE,KAAK,MAAM;KACrF,CAAC;AACJ"}
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","printerFileCleanTask","printerWebsocketTask","printerWebsocketRestoreTask"],"mappings":";;;;;;;;;;;IAiBaA,WAAW;eAAXA;;IAXGC,YAAY;eAAZA;;;6BAN0C;iCACjC;AAKlB,SAASA,aAAaC,IAAS,EAAEC,MAAoB,EAAEC,eAAe,CAAC,EAAEC,iBAAiB,KAAK;IACpG,IAAIC,eAAe;QAAE,GAAGH,MAAM;IAAC;IAC/BG,aAAaF,YAAY,GAAGD,OAAOC,YAAY,IAAIA;IACnDE,aAAaD,cAAc,GAAGA,kBAAkB;IAChD,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;QAE1DnB,aAAaS,yBAAQ,CAACW,oBAAoB,EAAET,yBAAW,CAACM,OAAO,EAAE,KAAK,MAAM;QAE5EjB,aAAaS,yBAAQ,CAACY,oBAAoB,EAAEV,yBAAW,CAACQ,QAAQ,EAAE,MAAM;QAExEnB,aAAaS,yBAAQ,CAACa,2BAA2B,EAAEX,yBAAW,CAACQ,QAAQ,EAAE,KAAK,MAAM;KACrF,CAAC;AACJ"}
@@ -18,31 +18,15 @@ _export(exports, {
18
18
  isNode: function() {
19
19
  return isNode;
20
20
  },
21
- isNodemon: function() {
22
- return isNodemon;
23
- },
24
- isPm2: function() {
25
- return isPm2;
26
- },
27
21
  isProductionEnvironment: function() {
28
22
  return isProductionEnvironment;
29
23
  },
30
24
  isTestEnvironment: function() {
31
25
  return isTestEnvironment;
32
- },
33
- verifyPackageJsonRequirements: function() {
34
- return verifyPackageJsonRequirements;
35
26
  }
36
27
  });
37
- const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
38
28
  const _logger = require("../handlers/logger");
39
29
  const _serverconstants = require("../server.constants");
40
- const _path = require("path");
41
- function _interop_require_default(obj) {
42
- return obj && obj.__esModule ? obj : {
43
- default: obj
44
- };
45
- }
46
30
  const logger = new _logger.LoggerService("Utils-Env", false);
47
31
  function getEnvOrDefault(key, defaultVal) {
48
32
  const val = process.env[key];
@@ -58,34 +42,8 @@ function isTestEnvironment() {
58
42
  function isProductionEnvironment() {
59
43
  return process.env.NODE_ENV === _serverconstants.AppConstants.defaultProductionEnv;
60
44
  }
61
- function isPm2() {
62
- return "PM2_HOME" in process.env || "PM2_JSON_PROCESSING" in process.env || "PM2_CLI" in process.env;
63
- }
64
- function isNodemon() {
65
- return "npm_lifecycle_script" in process.env && process.env.npm_lifecycle_script.includes("nodemon");
66
- }
67
45
  function isNode() {
68
46
  return "NODE" in process.env;
69
47
  }
70
- function verifyPackageJsonRequirements(rootPath) {
71
- const dirConts = _fs.default.readdirSync(rootPath);
72
- const hasPackageJson = dirConts.includes("package.json");
73
- if (!hasPackageJson) {
74
- logger.error(`FAILURE. Could not find 'package.json' in root folder ${rootPath}`);
75
- return false;
76
- }
77
- logger.debug("✓ found 'package.json'");
78
- const packageName = require((0, _path.join)(rootPath, "package.json")).name;
79
- if (!packageName) {
80
- logger.error("X Could not find 'name' property in package.json file. Aborting FDM Server.");
81
- return false;
82
- }
83
- if (packageName.toLowerCase() !== _serverconstants.AppConstants.serverPackageName) {
84
- logger.error(`X property 'name' in package.json file didnt equal 'fdm-monster' (found: ${packageName.toLowerCase()}). Aborting FDM Server.`);
85
- return false;
86
- }
87
- logger.debug("✓ Correctly validated FDM package.json file!");
88
- return true;
89
- }
90
48
 
91
49
  //# sourceMappingURL=env.utils.js.map
@@ -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","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;;IAoBAC,6BAA6B;eAA7BA;;;2DArCD;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;AAEO,SAASP,8BAA8BgB,QAAgB;IAC5D,MAAMC,WAAWC,WAAE,CAACC,WAAW,CAACH;IAChC,MAAMI,iBAAiBH,SAASF,QAAQ,CAAC;IACzC,IAAI,CAACK,gBAAgB;QACnBnB,OAAOoB,KAAK,CAAC,CAAC,sDAAsD,EAAEL,UAAU;QAChF,OAAO;IACT;IAEAf,OAAOqB,KAAK,CAAC;IACb,MAAMC,cAAcC,QAAQC,IAAAA,UAAI,EAACT,UAAU,iBAAiBU,IAAI;IAChE,IAAI,CAACH,aAAa;QAChBtB,OAAOoB,KAAK,CAAC;QACb,OAAO;IACT;IAEA,IAAIE,YAAYI,WAAW,OAAOjB,6BAAY,CAACkB,iBAAiB,EAAE;QAChE3B,OAAOoB,KAAK,CACV,CAAC,yEAAyE,EAAEE,YAAYI,WAAW,GAAG,uBAAuB,CAAC;QAEhI,OAAO;IACT;IAEA1B,OAAOqB,KAAK,CAAC;IACb,OAAO;AACT"}
1
+ {"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isDevelopmentEnvironment","isNode","isProductionEnvironment","isTestEnvironment","logger","LoggerService","key","defaultVal","val","process","env","length","NODE_ENV","AppConstants","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv"],"mappings":";;;;;;;;;;;IAOgBA,eAAe;eAAfA;;IAMAC,wBAAwB;eAAxBA;;IAYAC,MAAM;eAANA;;IAJAC,uBAAuB;eAAvBA;;IAJAC,iBAAiB;eAAjBA;;;wBAhBc;iCACD;AAG7B,MAAMC,SAAS,IAAIC,qBAAa,CAAC,aAAa;AAEvC,SAASN,gBAAgBO,GAAQ,EAAEC,UAAe;IACvD,MAAMC,MAAMC,QAAQC,GAAG,CAACJ,IAAI;IAC5B,IAAI,CAACE,KAAKG,QAAQ,OAAOJ;IACzB,OAAOC;AACT;AAEO,SAASR;IACd,OAAOS,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACC,qBAAqB;AACpE;AAEO,SAASX;IACd,OAAOM,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACE,cAAc;AAC7D;AAEO,SAASb;IACd,OAAOO,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACG,oBAAoB;AACnE;AAEO,SAASf;IACd,OAAO,UAAUQ,QAAQC,GAAG;AAC9B"}
@@ -84,7 +84,9 @@ function normalizeUrl(urlString, options) {
84
84
  }
85
85
  urlString = urlString.trim();
86
86
  if (/^data:/i.test(urlString)) {
87
- return normalizeDataURL(urlString, options);
87
+ return normalizeDataURL(urlString, {
88
+ stripHash: options.stripHash
89
+ });
88
90
  }
89
91
  if (hasCustomProtocol(urlString)) {
90
92
  return urlString;
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/utils/normalize-url.ts"],"names":["normalizeUrl","DATA_URL_DEFAULT_MIME_TYPE","DATA_URL_DEFAULT_CHARSET","testParameter","name","filters","some","filter","RegExp","test","supportedProtocols","Set","hasCustomProtocol","urlString","protocol","URL","endsWith","includes","has","normalizeDataURL","stripHash","match","exec","Error","type","data","hash","groups","mediaType","split","isBase64","length","pop","mimeType","shift","toLowerCase","attributes","map","attribute","key","value","string","trim","Boolean","normalizedMediaType","push","unshift","join","options","defaultProtocol","normalizeProtocol","forceHttp","forceHttps","stripAuthentication","stripTextFragment","stripWWW","removeQueryParameters","removeTrailingSlash","removeSingleSlash","removeDirectoryIndex","removeExplicitPort","sortQueryParameters","hasRelativeProtocol","startsWith","isRelativeUrl","replace","urlObject","username","password","pathname","protocolRegex","lastIndex","result","protocolAtIndex","index","intermediate","slice","remnant","decodeURI","Array","isArray","pathComponents","lastComponent","hostname","searchParams","keys","delete","keepQueryParameters","search","sort","decodeURIComponent","port","oldUrlString","toString","stripProtocol"],"mappings":"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"}
1
+ {"version":3,"sources":["../../src/utils/normalize-url.ts"],"names":["normalizeUrl","DATA_URL_DEFAULT_MIME_TYPE","DATA_URL_DEFAULT_CHARSET","testParameter","name","filters","some","filter","RegExp","test","supportedProtocols","Set","hasCustomProtocol","urlString","protocol","URL","endsWith","includes","has","normalizeDataURL","stripHash","match","exec","Error","type","data","hash","groups","mediaType","split","isBase64","length","pop","mimeType","shift","toLowerCase","attributes","map","attribute","key","value","string","trim","Boolean","normalizedMediaType","push","unshift","join","options","defaultProtocol","normalizeProtocol","forceHttp","forceHttps","stripAuthentication","stripTextFragment","stripWWW","removeQueryParameters","removeTrailingSlash","removeSingleSlash","removeDirectoryIndex","removeExplicitPort","sortQueryParameters","hasRelativeProtocol","startsWith","isRelativeUrl","replace","urlObject","username","password","pathname","protocolRegex","lastIndex","result","protocolAtIndex","index","intermediate","slice","remnant","decodeURI","Array","isArray","pathComponents","lastComponent","hostname","searchParams","keys","delete","keepQueryParameters","search","sort","decodeURIComponent","port","oldUrlString","toString","stripProtocol"],"mappings":"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"}
@@ -20,7 +20,7 @@ function PP(input) {
20
20
  return JSON.stringify(input, null, 2);
21
21
  }
22
22
  function PL(input) {
23
- return console.log(PP(input));
23
+ console.log(PP(input));
24
24
  }
25
25
 
26
26
  //# sourceMappingURL=pretty-print.utils.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/utils/pretty-print.utils.ts"],"names":["PL","PP","input","JSON","stringify","console","log"],"mappings":";;;;;;;;;;;IAIgBA,EAAE;eAAFA;;IAJAC,EAAE;eAAFA;;;AAAT,SAASA,GAAGC,KAAU;IAC3B,OAAOC,KAAKC,SAAS,CAACF,OAAO,MAAM;AACrC;AAEO,SAASF,GAAGE,KAAU;IAC3B,OAAOG,QAAQC,GAAG,CAACL,GAAGC;AACxB"}
1
+ {"version":3,"sources":["../../src/utils/pretty-print.utils.ts"],"names":["PL","PP","input","JSON","stringify","console","log"],"mappings":";;;;;;;;;;;IAIgBA,EAAE;eAAFA;;IAJAC,EAAE;eAAFA;;;AAAT,SAASA,GAAGC,KAAU;IAC3B,OAAOC,KAAKC,SAAS,CAACF,OAAO,MAAM;AACrC;AAEO,SAASF,GAAGE,KAAU;IAC3BG,QAAQC,GAAG,CAACL,GAAGC;AACjB"}
@@ -9,27 +9,25 @@ function _export(target, all) {
9
9
  });
10
10
  }
11
11
  _export(exports, {
12
+ defaultHttpProtocol: function() {
13
+ return defaultHttpProtocol;
14
+ },
12
15
  httpToWsUrl: function() {
13
16
  return httpToWsUrl;
14
- },
15
- normalizeURLWithProtocol: function() {
16
- return normalizeURLWithProtocol;
17
17
  }
18
18
  });
19
19
  const _normalizeurl = require("./normalize-url");
20
+ const defaultHttpProtocol = "https";
20
21
  function httpToWsUrl(url) {
21
- const protocolNormalizedUrl = normalizeURLWithProtocol(url);
22
- const wsUrl = new URL("/sockjs/websocket", protocolNormalizedUrl);
23
- wsUrl.protocol = protocolNormalizedUrl.startsWith("https://") ? "wss" : "ws";
24
- wsUrl.pathname = "/sockjs/websocket";
25
- return wsUrl;
26
- }
27
- function normalizeURLWithProtocol(printerURL) {
28
- if (!printerURL) return;
29
- if (!printerURL.startsWith("http://") && !printerURL.startsWith("https://")) {
30
- printerURL = `httpS://${printerURL}`;
22
+ if (!url?.length) {
23
+ return;
31
24
  }
32
- return (0, _normalizeurl.normalizeUrl)(printerURL);
25
+ const protocolNormalizedAddress = (0, _normalizeurl.normalizeUrl)(url, {
26
+ defaultProtocol: defaultHttpProtocol
27
+ });
28
+ const wsUrl = new URL(protocolNormalizedAddress);
29
+ wsUrl.protocol = wsUrl.protocol === "https:" ? "wss:" : "ws:";
30
+ return wsUrl;
33
31
  }
34
32
 
35
33
  //# sourceMappingURL=url.utils.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/utils/url.utils.ts"],"names":["httpToWsUrl","normalizeURLWithProtocol","url","protocolNormalizedUrl","wsUrl","URL","protocol","startsWith","pathname","printerURL","normalizeUrl"],"mappings":";;;;;;;;;;;IAEgBA,WAAW;eAAXA;;IAQAC,wBAAwB;eAAxBA;;;8BAVa;AAEtB,SAASD,YAAYE,GAAW;IACrC,MAAMC,wBAAwBF,yBAAyBC;IACvD,MAAME,QAAQ,IAAIC,IAAI,qBAAqBF;IAC3CC,MAAME,QAAQ,GAAGH,sBAAsBI,UAAU,CAAC,cAAc,QAAQ;IACxEH,MAAMI,QAAQ,GAAG;IACjB,OAAOJ;AACT;AAEO,SAASH,yBAAyBQ,UAAkB;IACzD,IAAI,CAACA,YAAY;IAEjB,IAAI,CAACA,WAAWF,UAAU,CAAC,cAAc,CAACE,WAAWF,UAAU,CAAC,aAAa;QAC3EE,aAAa,CAAC,QAAQ,EAAEA,YAAY;IACtC;IAEA,OAAOC,IAAAA,0BAAY,EAACD;AACtB"}
1
+ {"version":3,"sources":["../../src/utils/url.utils.ts"],"names":["defaultHttpProtocol","httpToWsUrl","url","length","protocolNormalizedAddress","normalizeUrl","defaultProtocol","wsUrl","URL","protocol"],"mappings":";;;;;;;;;;;IAEaA,mBAAmB;eAAnBA;;IAEGC,WAAW;eAAXA;;;8BAJa;AAEtB,MAAMD,sBAAsB;AAE5B,SAASC,YAAYC,GAAW;IACrC,IAAI,CAACA,KAAKC,QAAQ;QAChB;IACF;IAEA,MAAMC,4BAA4BC,IAAAA,0BAAY,EAACH,KAAK;QAAEI,iBAAiBN;IAAoB;IAE3F,MAAMO,QAAQ,IAAIC,IAAIJ;IACtBG,MAAME,QAAQ,GAAGF,MAAME,QAAQ,KAAK,WAAW,SAAS;IACxD,OAAOF;AACT"}
package/package.json CHANGED
@@ -6,7 +6,7 @@
6
6
  },
7
7
  "author": "David Zwart",
8
8
  "license": "AGPL-3.0-or-later",
9
- "version": "1.8.1",
9
+ "version": "1.8.3",
10
10
  "bin": {
11
11
  "fdm-monster": "dist/index.js",
12
12
  "fdmm": "dist/index.js"
@@ -15,16 +15,17 @@
15
15
  "main": "dist/index.js",
16
16
  "scripts": {
17
17
  "console:upload": "yarn build && cross-env NODE_ENV=development node ./dist/consoles/upload-test.js",
18
- "dev": "concurrently \"yarn build:watch\" \"yarn watch-dev\"",
19
- "watch-dev": "cross-env NODE_ENV=development nodemon --enable-source-maps --watch \"dist/**/*\" -e js ./dist/index.js",
20
- "console:github-releases": "yarn build && cross-env NODE_ENV=development nodemon --watch \"dist/**/*\" -e js ./dist/consoles/download-github-releases.js",
21
- "console:generate": "yarn build && cross-env NODE_ENV=development node ./dist/consoles/typeorm-generate.js",
22
- "console:torm": "yarn build && cross-env NODE_ENV=development nodemon --watch \"dist/**/*\" -e js ./dist/consoles/sqlite-torm.js",
23
- "console:migrate": "yarn build && cross-env NODE_ENV=development nodemon --watch \"dist/**/*\" -e js ./dist/consoles/typeorm-migrate.js",
24
- "build": "swc src -d dist --strip-leading-paths",
25
- "build:watch": "swc src -w -d dist --strip-leading-paths",
18
+ "dev": "yarn build:watch & yarn serve",
19
+ "serve": "NODE_ENV=development node --enable-source-maps --watch dist/index.js",
26
20
  "start:dev": "ts-node src/index.ts",
27
21
  "start": "cross-env NODE_ENV=production node dist/index.js",
22
+ "console:http-file-receiver": "node ./dist/consoles/http-file-receiver.console.js",
23
+ "console:github-releases": "yarn build && NODE_ENV=development node --watch --enable-source-maps ./dist/consoles/download-github-releases.js",
24
+ "console:generate": "yarn build && NODE_ENV=development node --enable-source-maps ./dist/consoles/typeorm-generate.js",
25
+ "console:torm": "yarn build && NODE_ENV=development node --watch --enable-source-maps ./dist/consoles/sqlite-torm.js",
26
+ "console:migrate": "yarn build && NODE_ENV=development node --watch --enable-source-maps ./dist/consoles/typeorm-migrate.js",
27
+ "build": "swc src -d dist --strip-leading-paths",
28
+ "build:watch": "swc src -w -d dist --strip-leading-paths",
28
29
  "migration:create": "migrate-mongo create printer-files-simpler",
29
30
  "migration:up": "migrate-mongo up",
30
31
  "migration:down": "migrate-mongo down",
@@ -53,17 +54,17 @@
53
54
  "vue"
54
55
  ],
55
56
  "dependencies": {
56
- "@fdm-monster/client": "1.8.4",
57
- "@fdm-monster/client-next": "0.0.14",
57
+ "@fdm-monster/client": "1.9.0",
58
+ "@fdm-monster/client-next": "0.0.18",
58
59
  "@octokit/plugin-throttling": "8.2.0",
59
- "@sentry/node": "8.45.0",
60
+ "@sentry/node": "9.6.1",
60
61
  "adm-zip": "0.5.16",
61
- "awilix": "12.0.4",
62
- "awilix-express": "9.0.1",
63
- "axios": "1.7.9",
64
- "bcryptjs": "2.4.3",
65
- "better-sqlite3": "11.7.0",
66
- "cache-manager": "6.3.1",
62
+ "awilix": "12.0.5",
63
+ "awilix-express": "9.0.2",
64
+ "axios": "1.8.3",
65
+ "bcryptjs": "3.0.2",
66
+ "better-sqlite3": "11.9.1",
67
+ "cache-manager": "6.4.1",
67
68
  "class-validator": "0.14.1",
68
69
  "connect-history-api-fallback": "2.0.0",
69
70
  "cookie-parser": "1.4.7",
@@ -72,76 +73,73 @@
72
73
  "dotenv": "16.4.7",
73
74
  "eventemitter2": "6.4.9",
74
75
  "express": "4.21.2",
75
- "form-data": "4.0.1",
76
- "helmet": "8.0.0",
76
+ "form-data": "4.0.2",
77
+ "helmet": "8.1.0",
77
78
  "js-yaml": "4.1.0",
78
79
  "jsonwebtoken": "9.0.2",
79
80
  "lodash": "4.17.21",
80
81
  "luxon": "3.5.0",
81
82
  "migrate-mongo": "11.0.0",
82
- "mongoose": "6.13.5",
83
+ "mongoose": "6.13.8",
83
84
  "multer": "1.4.5-lts.1",
84
85
  "node-input-validator": "4.5.1",
85
- "nodemon": "3.1.9",
86
86
  "octokit": "3.2.1",
87
87
  "passport": "0.7.0",
88
88
  "passport-anonymous": "1.0.1",
89
89
  "passport-jwt": "4.0.1",
90
90
  "reflect-metadata": "0.2.2",
91
- "semver": "7.6.3",
92
- "simple-git": "3.27.0",
91
+ "semver": "7.7.1",
93
92
  "socket.io": "4.8.1",
94
93
  "toad-scheduler": "3.0.1",
95
- "typeorm": "0.3.20",
96
- "uuid": "11.0.3",
94
+ "typeorm": "0.3.21",
95
+ "uuid": "11.1.0",
97
96
  "winston": "3.17.0",
98
- "ws": "8.18.0"
97
+ "ws": "8.18.1"
99
98
  },
100
99
  "devDependencies": {
101
100
  "@lcov-viewer/cli": "1.3.0",
102
101
  "@lcov-viewer/istanbul-report": "1.4.0",
103
- "@swc/cli": "0.5.2",
104
- "@swc/core": "1.10.1",
102
+ "@swc/cli": "0.6.0",
103
+ "@swc/core": "1.11.11",
105
104
  "@swc/jest": "0.2.37",
106
105
  "@types/adm-zip": "0.5.7",
107
- "@types/bcryptjs": "2.4.6",
108
- "@types/cache-manager": "4.0.6",
106
+ "@types/bcryptjs": "3.0.0",
107
+ "@types/cache-manager": "5.0.0",
109
108
  "@types/connect-history-api-fallback": "1.5.4",
110
109
  "@types/cookie-parser": "1.4.8",
111
110
  "@types/express": "5.0.0",
112
111
  "@types/ip": "1.1.3",
113
112
  "@types/jest": "29.5.14",
114
113
  "@types/js-yaml": "4.0.9",
115
- "@types/lodash": "4.17.13",
114
+ "@types/lodash": "4.17.16",
116
115
  "@types/luxon": "3.4.2",
117
116
  "@types/migrate-mongo": "10.0.5",
118
117
  "@types/multer": "1.4.12",
119
- "@types/node": "22.10.2",
118
+ "@types/node": "22.13.10",
120
119
  "@types/passport-anonymous": "1.0.5",
121
120
  "@types/passport-jwt": "4.0.1",
122
121
  "@types/semver": "7.5.8",
123
122
  "@types/supertest": "6.0.2",
124
123
  "@types/uuid": "10.0.0",
125
- "@types/ws": "8.5.13",
126
- "chokidar": "4.0.1",
127
- "concurrently": "9.1.0",
128
- "eslint": "9.16.0",
124
+ "@types/ws": "8.18.0",
125
+ "chokidar": "4.0.3",
126
+ "eslint": "9.22.0",
129
127
  "eslint-config-airbnb-base": "15.0.0",
130
- "eslint-config-prettier": "9.1.0",
128
+ "eslint-config-prettier": "10.1.1",
131
129
  "eslint-config-standard": "17.1.0",
132
130
  "eslint-plugin-import": "2.31.0",
133
- "eslint-plugin-n": "17.15.0",
131
+ "eslint-plugin-n": "17.16.2",
134
132
  "eslint-plugin-prettier": "4.2.1",
135
133
  "eslint-plugin-promise": "7.2.1",
136
134
  "express-list-routes": "1.2.4",
137
135
  "jest": "29.7.0",
138
136
  "jest-27-expect-message": "1.1.0",
139
- "mongodb-memory-server": "10.1.2",
137
+ "mongodb-memory-server": "10.1.4",
140
138
  "nock": "13.5.6",
141
139
  "prettier": "2.8.8",
142
140
  "supertest": "7.0.0",
143
141
  "ts-node": "10.9.2",
144
- "typescript": "5.7.2"
142
+ "typescript": "5.8.2"
145
143
  },
146
144
  "ignore-engines": false,
147
145
  "engine-strict": true,
@@ -150,18 +148,5 @@
150
148
  "npm": ">= 8.1.4",
151
149
  "yarn": ">= 1.22.10"
152
150
  },
153
- "nodemonConfig": {
154
- "verbose": false,
155
- "ignore": [
156
- ".github/*",
157
- "database/*",
158
- "docs/*",
159
- "docker/*",
160
- "installations/*",
161
- "media",
162
- "test/*"
163
- ],
164
- "delay": 100
165
- },
166
- "packageManager": "yarn@4.5.3"
151
+ "packageManager": "yarn@4.7.0"
167
152
  }