@fdm-monster/server 1.6.4 → 1.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (80) hide show
  1. package/.yarn/install-state.gz +0 -0
  2. package/README.md +2 -1
  3. package/RELEASE_NOTES.MD +24 -4
  4. package/dist/consoles/download-github-releases.js +50 -0
  5. package/dist/consoles/download-github-releases.js.map +1 -0
  6. package/dist/constants/event.constants.js.map +1 -1
  7. package/dist/constants/server-settings.constants.js +9 -6
  8. package/dist/constants/server-settings.constants.js.map +1 -1
  9. package/dist/controllers/plugin-firmware-update.controller.js +117 -18
  10. package/dist/controllers/plugin-firmware-update.controller.js.map +1 -1
  11. package/dist/controllers/printer.controller.js +2 -3
  12. package/dist/controllers/printer.controller.js.map +1 -1
  13. package/dist/controllers/server-public.controller.js +6 -1
  14. package/dist/controllers/server-public.controller.js.map +1 -1
  15. package/dist/controllers/settings.controller.js +38 -2
  16. package/dist/controllers/settings.controller.js.map +1 -1
  17. package/dist/controllers/validation/printer-controller.validation.js +2 -2
  18. package/dist/controllers/validation/printer-controller.validation.js.map +1 -1
  19. package/dist/entities/settings.entity.js +1 -1
  20. package/dist/entities/settings.entity.js.map +1 -1
  21. package/dist/handlers/cache-manager.js +2 -9
  22. package/dist/handlers/cache-manager.js.map +1 -1
  23. package/dist/middleware/printer.js +4 -1
  24. package/dist/middleware/printer.js.map +1 -1
  25. package/dist/models/Settings.js +12 -2
  26. package/dist/models/Settings.js.map +1 -1
  27. package/dist/server.constants.js +4 -2
  28. package/dist/server.constants.js.map +1 -1
  29. package/dist/server.host.js +16 -4
  30. package/dist/server.host.js.map +1 -1
  31. package/dist/services/core/batch-call.service.js +1 -1
  32. package/dist/services/core/batch-call.service.js.map +1 -1
  33. package/dist/services/core/client-bundle.service.js.map +1 -1
  34. package/dist/services/core/github.service.js.map +1 -1
  35. package/dist/services/core/server-release.service.js.map +1 -1
  36. package/dist/services/core/yaml.service.js +2 -1
  37. package/dist/services/core/yaml.service.js.map +1 -1
  38. package/dist/services/interfaces/settings.dto.js +1 -1
  39. package/dist/services/interfaces/settings.dto.js.map +1 -1
  40. package/dist/services/mongoose/print-completion.shared.js.map +1 -1
  41. package/dist/services/mongoose/settings.service.js +14 -5
  42. package/dist/services/mongoose/settings.service.js.map +1 -1
  43. package/dist/services/moonraker/moonraker-websocket.adapter.js +1 -2
  44. package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
  45. package/dist/services/moonraker/moonraker.client.js +1 -1
  46. package/dist/services/moonraker/moonraker.client.js.map +1 -1
  47. package/dist/services/moonraker.api.js +1 -1
  48. package/dist/services/moonraker.api.js.map +1 -1
  49. package/dist/services/octoprint/dto/octoprint-event.dto.js +1 -0
  50. package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
  51. package/dist/services/octoprint/octoprint.client.js.map +1 -1
  52. package/dist/services/octoprint/plugin-base.service.js +5 -5
  53. package/dist/services/octoprint/plugin-base.service.js.map +1 -1
  54. package/dist/services/octoprint/plugin-firmware-update.service.js +0 -1
  55. package/dist/services/octoprint/plugin-firmware-update.service.js.map +1 -1
  56. package/dist/services/octoprint/utils/file.utils.js +0 -1
  57. package/dist/services/octoprint/utils/file.utils.js.map +1 -1
  58. package/dist/services/octoprint.api.js.map +1 -1
  59. package/dist/services/orm/settings.service.js +17 -8
  60. package/dist/services/orm/settings.service.js.map +1 -1
  61. package/dist/services/printer-api.factory.js +3 -1
  62. package/dist/services/printer-api.factory.js.map +1 -1
  63. package/dist/services/printer-api.interface.js.map +1 -1
  64. package/dist/services/socket.factory.js +6 -1
  65. package/dist/services/socket.factory.js.map +1 -1
  66. package/dist/services/validators/printer-service.validation.js +2 -2
  67. package/dist/services/validators/printer-service.validation.js.map +1 -1
  68. package/dist/services/validators/settings-service.validation.js +14 -1
  69. package/dist/services/validators/settings-service.validation.js.map +1 -1
  70. package/dist/services/validators/yaml-service.validation.js +1 -1
  71. package/dist/services/validators/yaml-service.validation.js.map +1 -1
  72. package/dist/state/printer-events.cache.js +12 -0
  73. package/dist/state/printer-events.cache.js.map +1 -1
  74. package/dist/state/settings.store.js +26 -6
  75. package/dist/state/settings.store.js.map +1 -1
  76. package/package.json +15 -13
  77. package/requests/octoprint-pluginmanager-plugins.http +7 -0
  78. package/tsconfig.json +2 -2
  79. package/dist/services/octoprint/dto/connection/connection-state.dto.js +0 -21
  80. package/dist/services/octoprint/dto/connection/connection-state.dto.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService2","BaseService","Settings","SettingsDto","configService","constructor","typeormService","toDto","entity","serverSettingsKey","frontendSettingKey","fileCleanSettingKey","wizardSettingKey","timeoutSettingKey","getOrCreate","settings","get","create","getDefaultServerSettings","credentialSettingsKey","getDefaultCredentialSettings","getDefaultWizardSettings","getDefaultFileCleanSettings","getDefaultFrontendSettings","getDefaultTimeout","migrateSettingsRuntime","getServerSettings","patchServerSettings","serverSettingsPartial","Error","newServerSettings","updateServerSettings","serverSettings","update","id","updateCredentialSettings","credentialSettings","updateFileCleanSettings","fileCleanSettings","updateFrontendSettings","frontendSettings","updateTimeoutSettings","timeoutSettings","patchWizardSettings","wizardSettingsPartial","newWizardSettings","updateWizardSettings","wizardSettings","settingsList","repository","find","take","length","knownSettings","isWhiteListSettingEnabled","server","whitelistEnabled","whitelistedIpAddresses","getDefaultWhitelistIpAddresses","patchCredentialSettings","patchUpdate","newCredentialSettings","patchFileCleanSettings","newFileCleanSettings","setLoginRequired","enabled","loginRequired","setRegistrationEnabled","registration","setSentryDiagnosticsEnabled","sentryDiagnosticsEnabled","setWhitelist","ipAddresses","BadRequestException","validateInput","whitelistSettingUpdateRules","AppConstants","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS"],"mappings":"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"}
1
+ {"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService2","BaseService","Settings","SettingsDto","configService","constructor","typeormService","toDto","entity","serverSettingsKey","experimentalTypeormSupport","frontendSettingKey","printerFileCleanSettingKey","wizardSettingKey","timeoutSettingKey","getOrCreate","settings","get","create","getDefaultServerSettings","credentialSettingsKey","getDefaultCredentialSettings","getDefaultWizardSettings","getDefaultFileCleanSettings","getDefaultFrontendSettings","getDefaultTimeout","migrateSettingsRuntime","getServerSettings","patchServerSettings","serverSettingsPartial","Error","newServerSettings","updateServerSettings","serverSettings","update","id","updateCredentialSettings","credentialSettings","updateFileCleanSettings","fileCleanSettings","updateFrontendSettings","frontendSettings","updateTimeoutSettings","timeoutSettings","patchWizardSettings","wizardSettingsPartial","newWizardSettings","updateWizardSettings","wizardSettings","settingsList","repository","find","take","length","knownSettings","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","isWhiteListSettingEnabled","server","whitelistEnabled","whitelistedIpAddresses","getDefaultWhitelistIpAddresses","patchCredentialSettings","patchUpdate","newCredentialSettings","patchFileCleanSettings","newFileCleanSettings","setLoginRequired","enabled","loginRequired","setRegistrationEnabled","registration","setSentryDiagnosticsEnabled","sentryDiagnosticsEnabled","setWhitelist","ipAddresses","BadRequestException","validateInput","whitelistSettingUpdateRules","AppConstants","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS"],"mappings":"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"}
@@ -23,8 +23,10 @@ class PrinterApiFactory {
23
23
  let printerApi;
24
24
  if (login.printerType === _printerapiinterface.OctoprintType) {
25
25
  printerApi = this.cradle[_containertokens.DITokens.octoprintApi];
26
+ } else if (login.printerType === _printerapiinterface.MoonrakerType) {
27
+ printerApi = this.cradle[_containertokens.DITokens.moonrakerApi];
26
28
  } else {
27
- throw new Error("PrinterType is unsupported, cant pick the right api client");
29
+ throw new Error("PrinterType is unknown, cant pick the right socket adapter");
28
30
  }
29
31
  printerApi.login = login;
30
32
  return printerApi;
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/services/printer-api.factory.ts"],"names":["PrinterApiFactory","cradle","constructor","getById","id","login","DITokens","printerCache","getLoginDto","getScopedPrinter","printerApi","printerType","OctoprintType","octoprintApi","Error"],"mappings":";;;;+BAMaA;;;eAAAA;;;qCAN6C;iCACjC;AAKlB,MAAMA;IACXC,OAAY;IAEZC,YAAYD,MAAU,CAAE;QACtB,IAAI,CAACA,MAAM,GAAGA;IAChB;IAEAE,QAAQC,EAAU,EAAe;QAC/B,MAAMC,QAAQ,AAAC,IAAI,CAACJ,MAAM,CAACK,yBAAQ,CAACC,YAAY,CAAC,CAAkBC,WAAW,CAACJ;QAC/E,OAAO,IAAI,CAACK,gBAAgB,CAACJ;IAC/B;IAEAI,iBAAiBJ,KAAe,EAAe;QAC7C,IAAIK;QACJ,IAAIL,MAAMM,WAAW,KAAKC,kCAAa,EAAE;YACvCF,aAAa,IAAI,CAACT,MAAM,CAACK,yBAAQ,CAACO,YAAY,CAAC;QACjD,OAIK;YACH,MAAM,IAAIC,MAAM;QAClB;QAEAJ,WAAWL,KAAK,GAAGA;QACnB,OAAOK;IACT;AACF"}
1
+ {"version":3,"sources":["../../src/services/printer-api.factory.ts"],"names":["PrinterApiFactory","cradle","constructor","getById","id","login","DITokens","printerCache","getLoginDto","getScopedPrinter","printerApi","printerType","OctoprintType","octoprintApi","MoonrakerType","moonrakerApi","Error"],"mappings":";;;;+BAMaA;;;eAAAA;;;qCAN6C;iCACjC;AAKlB,MAAMA;IACXC,OAAY;IAEZC,YAAYD,MAAU,CAAE;QACtB,IAAI,CAACA,MAAM,GAAGA;IAChB;IAEAE,QAAQC,EAAU,EAAe;QAC/B,MAAMC,QAAQ,AAAC,IAAI,CAACJ,MAAM,CAACK,yBAAQ,CAACC,YAAY,CAAC,CAAkBC,WAAW,CAACJ;QAC/E,OAAO,IAAI,CAACK,gBAAgB,CAACJ;IAC/B;IAEAI,iBAAiBJ,KAAe,EAAe;QAC7C,IAAIK;QACJ,IAAIL,MAAMM,WAAW,KAAKC,kCAAa,EAAE;YACvCF,aAAa,IAAI,CAACT,MAAM,CAACK,yBAAQ,CAACO,YAAY,CAAC;QACjD,OAAO,IAAIR,MAAMM,WAAW,KAAKG,kCAAa,EAAE;YAC9CJ,aAAa,IAAI,CAACT,MAAM,CAACK,yBAAQ,CAACS,YAAY,CAAC;QACjD,OAAO;YACL,MAAM,IAAIC,MAAM;QAClB;QAEAN,WAAWL,KAAK,GAAGA;QACnB,OAAOK;IACT;AACF"}
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/services/printer-api.interface.ts"],"names":["MoonrakerType","OctoprintType","capabilities","startPrint"],"mappings":";;;;;;;;;;;IAIaA,aAAa;eAAbA;;IADAC,aAAa;eAAbA;;IAwBAC,YAAY;eAAZA;;;AAxBN,MAAMD,gBAAgB;AACtB,MAAMD,gBAAgB;AAuBtB,MAAME,eAAe;IAE1BC,YAAY;AACd"}
1
+ {"version":3,"sources":["../../src/services/printer-api.interface.ts"],"names":["MoonrakerType","OctoprintType","capabilities","startPrint"],"mappings":";;;;;;;;;;;IAIaA,aAAa;eAAbA;;IADAC,aAAa;eAAbA;;IAmBAC,YAAY;eAAZA;;;AAnBN,MAAMD,gBAAgB;AACtB,MAAMD,gBAAgB;AAkBtB,MAAME,eAAe;IAE1BC,YAAY;AACd"}
@@ -16,10 +16,15 @@ class SocketFactory {
16
16
  this.cradle = cradle;
17
17
  }
18
18
  createInstance(printerType) {
19
+ const settingsStore = this.cradle[_containertokens.DITokens.settingsStore];
20
+ const serverSettings = settingsStore.getServerSettings();
21
+ const moonrakerSupport = serverSettings.experimentalMoonrakerSupport;
19
22
  if (printerType === _printerapiinterface.OctoprintType) {
20
23
  return this.cradle[_containertokens.DITokens.octoPrintSockIoAdapter];
24
+ } else if (moonrakerSupport && printerType === _printerapiinterface.MoonrakerType) {
25
+ return this.cradle[_containertokens.DITokens.moonrakerWebsocketAdapter];
21
26
  } else {
22
- throw new Error("PrinterType is unsupported, cant pick the right socket adapter");
27
+ throw new Error("PrinterType is unknown, cant pick the right socket adapter");
23
28
  }
24
29
  }
25
30
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/services/socket.factory.ts"],"names":["SocketFactory","cradle","constructor","createInstance","printerType","OctoprintType","DITokens","octoPrintSockIoAdapter","Error"],"mappings":";;;;+BAKaA;;;eAAAA;;;iCALY;qCAGoB;AAEtC,MAAMA;IACXC,OAAY;IAEZC,YAAYD,MAAU,CAAE;QACtB,IAAI,CAACA,MAAM,GAAGA;IAChB;IAEAE,eAAeC,WAAmB,EAAyD;QACzF,IAAIA,gBAAgBC,kCAAa,EAAE;YACjC,OAAO,IAAI,CAACJ,MAAM,CAACK,yBAAQ,CAACC,sBAAsB,CAAC;QACrD,OAIK;YACH,MAAM,IAAIC,MAAM;QAClB;IACF;AACF"}
1
+ {"version":3,"sources":["../../src/services/socket.factory.ts"],"names":["SocketFactory","cradle","constructor","createInstance","printerType","settingsStore","DITokens","serverSettings","getServerSettings","moonrakerSupport","experimentalMoonrakerSupport","OctoprintType","octoPrintSockIoAdapter","MoonrakerType","moonrakerWebsocketAdapter","Error"],"mappings":";;;;+BAMaA;;;eAAAA;;;iCANY;qCAGoB;AAGtC,MAAMA;IACXC,OAAY;IAEZC,YAAYD,MAAU,CAAE;QACtB,IAAI,CAACA,MAAM,GAAGA;IAChB;IAEAE,eAAeC,WAAmB,EAAyD;QACzF,MAAMC,gBAAgB,IAAI,CAACJ,MAAM,CAACK,yBAAQ,CAACD,aAAa,CAAC;QACzD,MAAME,iBAAiBF,cAAcG,iBAAiB;QACtD,MAAMC,mBAAmBF,eAAeG,4BAA4B;QAEpE,IAAIN,gBAAgBO,kCAAa,EAAE;YACjC,OAAO,IAAI,CAACV,MAAM,CAACK,yBAAQ,CAACM,sBAAsB,CAAC;QACrD,OAAO,IAAIH,oBAAoBL,gBAAgBS,kCAAa,EAAE;YAC5D,OAAO,IAAI,CAACZ,MAAM,CAACK,yBAAQ,CAACQ,yBAAyB,CAAC;QACxD,OAAO;YACL,MAAM,IAAIC,MAAM;QAClB;IACF;AACF"}
@@ -28,14 +28,14 @@ const createMongoPrinterRules = {
28
28
  _id: "not",
29
29
  apiKey: `required|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
30
30
  printerURL: "required|httpurl",
31
- printerType: `required|integer|in:${_printerapiinterface.OctoprintType}`,
31
+ printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
32
32
  enabled: "boolean",
33
33
  name: "string"
34
34
  };
35
35
  const createPrinterRules = {
36
36
  apiKey: `required|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
37
37
  printerURL: "required|httpurl",
38
- printerType: `required|integer|in:${_printerapiinterface.OctoprintType}`,
38
+ printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
39
39
  enabled: "boolean",
40
40
  name: "required|string"
41
41
  };
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createMongoPrinterRules","createPrinterRules","updatePrinterDisabledReasonRule","updatePrinterEnabledRule","_id","apiKey","UUID_LENGTH","printerURL","printerType","OctoprintType","enabled","name","disabledReason"],"mappings":";;;;;;;;;;;IAGaA,uBAAuB;eAAvBA;;IASAC,kBAAkB;eAAlBA;;IAYAC,+BAA+B;eAA/BA;;IAJAC,wBAAwB;eAAxBA;;;kCApBe;qCACE;AAEvB,MAAMH,0BAA0B;IACrCI,KAAK;IACLC,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;IACZC,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,EAAE;IACnDC,SAAS;IACTC,MAAM;AACR;AAEO,MAAMV,qBAAqB;IAChCI,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;IACZC,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,EAAE;IACnDC,SAAS;IACTC,MAAM;AACR;AAEO,MAAMR,2BAA2B;IACtCO,SAAS;AACX;AAEO,MAAMR,kCAAkC;IAC7CU,gBAAgB;IAChBF,SAAS;AACX"}
1
+ {"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createMongoPrinterRules","createPrinterRules","updatePrinterDisabledReasonRule","updatePrinterEnabledRule","_id","apiKey","UUID_LENGTH","printerURL","printerType","OctoprintType","MoonrakerType","enabled","name","disabledReason"],"mappings":";;;;;;;;;;;IAGaA,uBAAuB;eAAvBA;;IASAC,kBAAkB;eAAlBA;;IAYAC,+BAA+B;eAA/BA;;IAJAC,wBAAwB;eAAxBA;;;kCApBe;qCACiB;AAEtC,MAAMH,0BAA0B;IACrCI,KAAK;IACLC,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;IACZC,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,SAAS;IACTC,MAAM;AACR;AAEO,MAAMX,qBAAqB;IAChCI,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;IACZC,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,SAAS;IACTC,MAAM;AACR;AAEO,MAAMT,2BAA2B;IACtCQ,SAAS;AACX;AAEO,MAAMT,kCAAkC;IAC7CW,gBAAgB;IAChBF,SAAS;AACX"}
@@ -9,6 +9,9 @@ function _export(target, all) {
9
9
  });
10
10
  }
11
11
  _export(exports, {
12
+ clientNextRules: function() {
13
+ return clientNextRules;
14
+ },
12
15
  credentialSettingPatchRules: function() {
13
16
  return credentialSettingPatchRules;
14
17
  },
@@ -18,6 +21,9 @@ _export(exports, {
18
21
  frontendSettingsUpdateRules: function() {
19
22
  return frontendSettingsUpdateRules;
20
23
  },
24
+ moonrakerSupportRules: function() {
25
+ return moonrakerSupportRules;
26
+ },
21
27
  sentryDiagnosticsEnabledRules: function() {
22
28
  return sentryDiagnosticsEnabledRules;
23
29
  },
@@ -43,7 +49,8 @@ const serverSettingsUpdateRules = (whitelistFeatureEnabled)=>({
43
49
  "debugSettings.debugSocketReconnect": "boolean",
44
50
  whitelistEnabled: whitelistFeatureEnabled ? "boolean" : "not",
45
51
  whitelistedIpAddresses: whitelistFeatureEnabled ? "array|minLength:1" : "not",
46
- "whitelistedIpAddresses.*": whitelistFeatureEnabled ? "required|string" : "not"
52
+ "whitelistedIpAddresses.*": whitelistFeatureEnabled ? "required|string" : "not",
53
+ experimentalMoonrakerSupport: "boolean"
47
54
  });
48
55
  const timeoutSettingsUpdateRules = {
49
56
  apiTimeout: "integer|min:1000"
@@ -77,5 +84,11 @@ const fileCleanSettingsUpdateRules = {
77
84
  const sentryDiagnosticsEnabledRules = {
78
85
  enabled: "required|boolean"
79
86
  };
87
+ const moonrakerSupportRules = {
88
+ enabled: "required|boolean"
89
+ };
90
+ const clientNextRules = {
91
+ enabled: "required|boolean"
92
+ };
80
93
 
81
94
  //# sourceMappingURL=settings-service.validation.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/services/validators/settings-service.validation.ts"],"names":["credentialSettingPatchRules","fileCleanSettingsUpdateRules","frontendSettingsUpdateRules","sentryDiagnosticsEnabledRules","serverSettingsUpdateRules","timeoutSettingsUpdateRules","whitelistSettingUpdateRules","wizardUpdateRules","whitelistFeatureEnabled","registration","loginRequired","debugSettings","whitelistEnabled","whitelistedIpAddresses","apiTimeout","gridCols","gridRows","largeTiles","jwtSecret","jwtExpiresIn","isProductionEnvironment","refreshTokenAttempts","refreshTokenExpiry","wizardCompleted","wizardCompletedAt","wizardVersion","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","enabled"],"mappings":";;;;;;;;;;;IAuBaA,2BAA2B;eAA3BA;;IAmBAC,4BAA4B;eAA5BA;;IAzBAC,2BAA2B;eAA3BA;;IA+BAC,6BAA6B;eAA7BA;;IA9CAC,yBAAyB;eAAzBA;;IAWAC,0BAA0B;eAA1BA;;IAiBAC,2BAA2B;eAA3BA;;IAMAC,iBAAiB;eAAjBA;;;0BApC2B;AAEjC,MAAMH,4BAA4B,CAACI,0BAAsC,CAAA;QAC9EC,cAAc;QACdC,eAAe;QACfC,eAAe;QACf,mCAAmC;QACnC,sCAAsC;QACtCC,kBAAkBJ,0BAA0B,YAAY;QACxDK,wBAAwBL,0BAA0B,sBAAsB;QACxE,4BAA4BA,0BAA0B,oBAAoB;IAC5E,CAAA;AAEO,MAAMH,6BAA6B;IACxCS,YAAY;AACd;AAEO,MAAMZ,8BAA8B;IACzCa,UAAU;IACVC,UAAU;IACVC,YAAY;AACd;AAEO,MAAMjB,8BAA8B;IACzCkB,WAAW;IACXC,cAAcC,IAAAA,iCAAuB,MAAK,6BAA6B;IACvEC,sBAAsB;IACtBC,oBAAoBF,IAAAA,iCAAuB,MAAK,oBAAoB;AACtE;AAEO,MAAMd,8BAA8B;IACzCO,wBAAwB;IACxB,4BAA4B;IAC5BD,kBAAkB;AACpB;AAEO,MAAML,oBAAoB;IAC/BgB,iBAAiB;IACjBC,mBAAmB;IACnBC,eAAe;AACjB;AAEO,MAAMxB,+BAA+B;IAC1CyB,gCAAgC;IAChCC,0BAA0B;IAC1BC,iCAAiC;AACnC;AAEO,MAAMzB,gCAAgC;IAC3C0B,SAAS;AACX"}
1
+ {"version":3,"sources":["../../../src/services/validators/settings-service.validation.ts"],"names":["clientNextRules","credentialSettingPatchRules","fileCleanSettingsUpdateRules","frontendSettingsUpdateRules","moonrakerSupportRules","sentryDiagnosticsEnabledRules","serverSettingsUpdateRules","timeoutSettingsUpdateRules","whitelistSettingUpdateRules","wizardUpdateRules","whitelistFeatureEnabled","registration","loginRequired","debugSettings","whitelistEnabled","whitelistedIpAddresses","experimentalMoonrakerSupport","apiTimeout","gridCols","gridRows","largeTiles","jwtSecret","jwtExpiresIn","isProductionEnvironment","refreshTokenAttempts","refreshTokenExpiry","wizardCompleted","wizardCompletedAt","wizardVersion","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","enabled"],"mappings":";;;;;;;;;;;IAyDaA,eAAe;eAAfA;;IAjCAC,2BAA2B;eAA3BA;;IAmBAC,4BAA4B;eAA5BA;;IAzBAC,2BAA2B;eAA3BA;;IAmCAC,qBAAqB;eAArBA;;IAJAC,6BAA6B;eAA7BA;;IA/CAC,yBAAyB;eAAzBA;;IAYAC,0BAA0B;eAA1BA;;IAiBAC,2BAA2B;eAA3BA;;IAMAC,iBAAiB;eAAjBA;;;0BArC2B;AAEjC,MAAMH,4BAA4B,CAACI,0BAAsC,CAAA;QAC9EC,cAAc;QACdC,eAAe;QACfC,eAAe;QACf,mCAAmC;QACnC,sCAAsC;QACtCC,kBAAkBJ,0BAA0B,YAAY;QACxDK,wBAAwBL,0BAA0B,sBAAsB;QACxE,4BAA4BA,0BAA0B,oBAAoB;QAC1EM,8BAA8B;IAChC,CAAA;AAEO,MAAMT,6BAA6B;IACxCU,YAAY;AACd;AAEO,MAAMd,8BAA8B;IACzCe,UAAU;IACVC,UAAU;IACVC,YAAY;AACd;AAEO,MAAMnB,8BAA8B;IACzCoB,WAAW;IACXC,cAAcC,IAAAA,iCAAuB,MAAK,6BAA6B;IACvEC,sBAAsB;IACtBC,oBAAoBF,IAAAA,iCAAuB,MAAK,oBAAoB;AACtE;AAEO,MAAMf,8BAA8B;IACzCO,wBAAwB;IACxB,4BAA4B;IAC5BD,kBAAkB;AACpB;AAEO,MAAML,oBAAoB;IAC/BiB,iBAAiB;IACjBC,mBAAmB;IACnBC,eAAe;AACjB;AAEO,MAAM1B,+BAA+B;IAC1C2B,gCAAgC;IAChCC,0BAA0B;IAC1BC,iCAAiC;AACnC;AAEO,MAAM1B,gCAAgC;IAC3C2B,SAAS;AACX;AAEO,MAAM5B,wBAAwB;IACnC4B,SAAS;AACX;AAEO,MAAMhC,kBAAkB;IAC7BgC,SAAS;AACX"}
@@ -47,7 +47,7 @@ const importPrintersFloorsYamlRules = (importPrinters, importFloorGrid, importFl
47
47
  "printers.*.apiKey": `required|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
48
48
  "printers.*.printerURL": "required|httpurl",
49
49
  "printers.*.enabled": "boolean",
50
- "printers.*.printerType": `integer|in:${_printerapiinterface.OctoprintType}`,
50
+ "printers.*.printerType": `integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
51
51
  "printers.*.name": "required|string",
52
52
  floors: `${!!importFloors ? "array|minLength:0" : "not"}`,
53
53
  "floors.*.id": "required",
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlRules","importPrinterPositionsRules","importPrintersFloorsYamlRules","exportPrinters","exportFloorGrid","exportFloors","exportGroups","printerComparisonStrategiesByPriority","floorComparisonStrategiesByPriority","notes","importPrinters","importFloorGrid","importFloors","importGroups","version","config","printers","UUID_LENGTH","OctoprintType","floors","groups","isTypeormMode"],"mappings":";;;;;;;;;;;IAGaA,6BAA6B;eAA7BA;;IAsDAC,2BAA2B;eAA3BA;;IApCAC,6BAA6B;eAA7BA;;;kCArBe;qCACE;AAEvB,MAAMF,gCAAgC;IAE3CG,gBAAgB;IAChBC,iBAAiB;IACjBC,cAAc;IAEdC,cAAc;IAEdC,uCAAuC;IACvC,2CAA2C;IAC3CC,qCAAqC;IAErCC,OAAO;AAIT;AAEO,MAAMP,gCAAgC,CAC3CQ,gBACAC,iBACAC,cACAC;IAEA,OAAO;QACLC,SAAS;QACTC,QAAQ;QACR,yBAAyB;QACzB,0BAA0B;QAC1B,uBAAuB;QACvB,uBAAuB;QACvB,gDAAgD;QAChD,kDAAkD;QAClD,8CAA8C;QAC9CC,UAAU,GAAG,CAAC,CAACN,iBAAiB,sBAAsB,OAAO;QAC7D,iBAAiB;QACjB,qBAAqB,CAAC,gBAAgB,EAAEO,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;QACjF,yBAAyB;QACzB,sBAAsB;QACtB,0BAA0B,CAAC,WAAW,EAAEC,kCAAa,EAAE;QACvD,mBAAmB;QACnBC,QAAQ,GAAG,CAAC,CAACP,eAAe,sBAAsB,OAAO;QACzD,eAAe;QACf,kBAAkB;QAClB,iBAAiB;QAEjBQ,QAAQ,GAAG,CAAC,CAACP,eAAe,sBAAsB,OAAO;QACzD,eAAe;QACf,iBAAiB;IAGnB;AACF;AAEO,MAAMZ,8BAA8B,CAACoB,gBAA4B,CAAA;QACtEL,UAAU;QACV,wBAAwB;QAExB,gBAAgB;QAChB,gBAAgB;IAClB,CAAA"}
1
+ {"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlRules","importPrinterPositionsRules","importPrintersFloorsYamlRules","exportPrinters","exportFloorGrid","exportFloors","exportGroups","printerComparisonStrategiesByPriority","floorComparisonStrategiesByPriority","notes","importPrinters","importFloorGrid","importFloors","importGroups","version","config","printers","UUID_LENGTH","OctoprintType","MoonrakerType","floors","groups","isTypeormMode"],"mappings":";;;;;;;;;;;IAGaA,6BAA6B;eAA7BA;;IAsDAC,2BAA2B;eAA3BA;;IApCAC,6BAA6B;eAA7BA;;;kCArBe;qCACiB;AAEtC,MAAMF,gCAAgC;IAE3CG,gBAAgB;IAChBC,iBAAiB;IACjBC,cAAc;IAEdC,cAAc;IAEdC,uCAAuC;IACvC,2CAA2C;IAC3CC,qCAAqC;IAErCC,OAAO;AAIT;AAEO,MAAMP,gCAAgC,CAC3CQ,gBACAC,iBACAC,cACAC;IAEA,OAAO;QACLC,SAAS;QACTC,QAAQ;QACR,yBAAyB;QACzB,0BAA0B;QAC1B,uBAAuB;QACvB,uBAAuB;QACvB,gDAAgD;QAChD,kDAAkD;QAClD,8CAA8C;QAC9CC,UAAU,GAAG,CAAC,CAACN,iBAAiB,sBAAsB,OAAO;QAC7D,iBAAiB;QACjB,qBAAqB,CAAC,gBAAgB,EAAEO,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;QACjF,yBAAyB;QACzB,sBAAsB;QACtB,0BAA0B,CAAC,WAAW,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;QACxE,mBAAmB;QACnBC,QAAQ,GAAG,CAAC,CAACR,eAAe,sBAAsB,OAAO;QACzD,eAAe;QACf,kBAAkB;QAClB,iBAAiB;QAEjBS,QAAQ,GAAG,CAAC,CAACR,eAAe,sBAAsB,OAAO;QACzD,eAAe;QACf,iBAAiB;IAGnB;AACF;AAEO,MAAMZ,8BAA8B,CAACqB,gBAA4B,CAAA;QACtEN,UAAU;QACV,wBAAwB;QAExB,gBAAgB;QAChB,gBAAgB;IAClB,CAAA"}
@@ -37,6 +37,7 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
37
37
  ref = {
38
38
  connected: null,
39
39
  reauthRequired: null,
40
+ notify_status_update: null,
40
41
  current: null,
41
42
  history: null,
42
43
  API_STATE_UPDATED: null,
@@ -73,6 +74,7 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
73
74
  }
74
75
  subscribeToEvents() {
75
76
  this.eventEmitter2.on("octoprint.*", (e)=>this.onOctoPrintSocketMessage(e));
77
+ this.eventEmitter2.on("moonraker.*", (e)=>this.onMoonrakerSocketMessage(e));
76
78
  this.eventEmitter2.on(_eventconstants.printerEvents.printersDeleted, this.handlePrintersDeleted.bind(this));
77
79
  }
78
80
  async onOctoPrintSocketMessage(e) {
@@ -87,6 +89,16 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
87
89
  }
88
90
  }
89
91
  }
92
+ async onMoonrakerSocketMessage(e) {
93
+ const printerId = e.printerId;
94
+ const eventType = e.event;
95
+ if ([
96
+ "notify_status_update",
97
+ "current"
98
+ ].includes(eventType)) {
99
+ await this.setEvent(printerId, eventType, e.payload);
100
+ }
101
+ }
90
102
  pruneHistoryPayload(payload) {
91
103
  delete payload.logs;
92
104
  delete payload.temps;
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","eventEmitter2","settingsStore","constructor","loggerFactory","name","subscribeToEvents","_debugMode","getSettingsSensitive","server","debugSettings","debugSocketMessages","deletePrinterSocketEvents","id","deleteKeyValue","getPrinterSocketEvents","keyValueStore","getOrCreateEvents","printerId","ref","getValue","connected","reauthRequired","current","history","API_STATE_UPDATED","WS_CLOSED","WS_ERROR","WS_OPENED","WS_STATE_UPDATED","setKeyValue","setEvent","label","payload","receivedAt","Date","now","setSubstate","substateName","handlePrintersDeleted","printerIds","deleteKeysBatch","on","e","onOctoPrintSocketMessage","printerEvents","printersDeleted","bind","includes","event","pruneHistoryPayload","log","formatKB","logs","temps","messages"],"mappings":"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"}
1
+ {"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","eventEmitter2","settingsStore","constructor","loggerFactory","name","subscribeToEvents","_debugMode","getSettingsSensitive","server","debugSettings","debugSocketMessages","deletePrinterSocketEvents","id","deleteKeyValue","getPrinterSocketEvents","keyValueStore","getOrCreateEvents","printerId","ref","getValue","connected","reauthRequired","notify_status_update","current","history","API_STATE_UPDATED","WS_CLOSED","WS_ERROR","WS_OPENED","WS_STATE_UPDATED","setKeyValue","setEvent","label","payload","receivedAt","Date","now","setSubstate","substateName","handlePrintersDeleted","printerIds","deleteKeysBatch","on","e","onOctoPrintSocketMessage","onMoonrakerSocketMessage","printerEvents","printersDeleted","bind","includes","event","pruneHistoryPayload","log","formatKB","eventType","logs","temps","messages"],"mappings":"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"}
@@ -14,12 +14,14 @@ const _node = require("@sentry/node");
14
14
  const _envutils = require("../utils/env.utils");
15
15
  const _serverconstants = require("../server.constants");
16
16
  class SettingsStore {
17
+ isTypeOrmMode;
17
18
  settingsService;
18
19
  logger;
19
20
  settings = null;
20
- constructor({ settingsService, loggerFactory }){
21
+ constructor({ settingsService, loggerFactory, isTypeormMode }){
21
22
  this.settingsService = settingsService;
22
23
  this.logger = loggerFactory(SettingsStore.name);
24
+ this.isTypeOrmMode = isTypeormMode;
23
25
  }
24
26
  getSettings() {
25
27
  const settings = this.settings;
@@ -28,11 +30,14 @@ class SettingsStore {
28
30
  [_serversettingsconstants.serverSettingsKey]: {
29
31
  loginRequired: settings[_serversettingsconstants.serverSettingsKey].loginRequired,
30
32
  registration: settings[_serversettingsconstants.serverSettingsKey].registration,
31
- sentryDiagnosticsEnabled: settings[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled
33
+ sentryDiagnosticsEnabled: settings[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled,
34
+ experimentalMoonrakerSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
35
+ experimentalTypeormSupport: this.isTypeOrmMode,
36
+ experimentalClientSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalClientSupport
32
37
  },
33
38
  [_serversettingsconstants.wizardSettingKey]: settings[_serversettingsconstants.wizardSettingKey],
34
39
  [_serversettingsconstants.frontendSettingKey]: settings[_serversettingsconstants.frontendSettingKey],
35
- [_serversettingsconstants.fileCleanSettingKey]: settings[_serversettingsconstants.fileCleanSettingKey],
40
+ [_serversettingsconstants.printerFileCleanSettingKey]: settings[_serversettingsconstants.printerFileCleanSettingKey],
36
41
  [_serversettingsconstants.timeoutSettingKey]: settings[_serversettingsconstants.timeoutSettingKey]
37
42
  });
38
43
  }
@@ -48,7 +53,10 @@ class SettingsStore {
48
53
  [_serversettingsconstants.serverSettingsKey]: {
49
54
  debugSettings: settings[_serversettingsconstants.serverSettingsKey].debugSettings,
50
55
  whitelistEnabled: settings[_serversettingsconstants.serverSettingsKey].whitelistEnabled,
51
- whitelistedIpAddresses: settings[_serversettingsconstants.serverSettingsKey].whitelistedIpAddresses
56
+ whitelistedIpAddresses: settings[_serversettingsconstants.serverSettingsKey].whitelistedIpAddresses,
57
+ experimentalMoonrakerSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
58
+ experimentalTypeormSupport: this.isTypeOrmMode,
59
+ experimentalClientSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalClientSupport
52
60
  }
53
61
  });
54
62
  }
@@ -101,10 +109,10 @@ class SettingsStore {
101
109
  return this.getSettings()[_serversettingsconstants.frontendSettingKey];
102
110
  }
103
111
  getFileCleanSettings() {
104
- return this.getSettings()[_serversettingsconstants.fileCleanSettingKey];
112
+ return this.getSettings()[_serversettingsconstants.printerFileCleanSettingKey];
105
113
  }
106
114
  isPreUploadFileCleanEnabled() {
107
- return this.getSettings()[_serversettingsconstants.fileCleanSettingKey]?.autoRemoveOldFilesBeforeUpload;
115
+ return this.getSettings()[_serversettingsconstants.printerFileCleanSettingKey]?.autoRemoveOldFilesBeforeUpload;
108
116
  }
109
117
  async setWizardCompleted(version) {
110
118
  this.settings = await this.settingsService.patchWizardSettings({
@@ -159,6 +167,18 @@ class SettingsStore {
159
167
  await this.processSentryEnabled();
160
168
  return this.getSettings();
161
169
  }
170
+ async setExperimentalMoonrakerSupport(moonrakerEnabled) {
171
+ this.settings = await this.settingsService.patchServerSettings({
172
+ experimentalMoonrakerSupport: moonrakerEnabled
173
+ });
174
+ return this.getSettings();
175
+ }
176
+ async setExperimentalClientSupport(experimentalClientEnabled) {
177
+ this.settings = await this.settingsService.patchServerSettings({
178
+ experimentalClientSupport: experimentalClientEnabled
179
+ });
180
+ return this.getSettings();
181
+ }
162
182
  async updateFrontendSettings(frontendSettings) {
163
183
  this.settings = await this.settingsService.updateFrontendSettings(frontendSettings);
164
184
  return this.getSettings();
@@ -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","getDebugSettingsSensitive","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","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","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","debugSettings","whitelistEnabled","whitelistedIpAddresses","getDebugSettingsSensitive","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","setExperimentalMoonrakerSupport","moonrakerEnabled","setExperimentalClientSupport","experimentalClientEnabled","updateFrontendSettings","frontendSettings","sentryEnabled","log","isTestEnvironment","client","getCurrentHub","getClient","warn","getOptions","enabled"],"mappings":";;;;+BAwBaA;;;eAAAA;;;mCAxB2B;yCAQjC;sBACuB;0BACI;iCACL;AAatB,MAAMA;IACHC,cAAuB;IACvBC,gBAAkC;IAClCC,OAAsB;IACtBC,WAA6B,KAAK;IAE1CC,YAAY,EACVH,eAAe,EACfI,aAAa,EACbC,aAAa,EAKd,CAAE;QACD,IAAI,CAACL,eAAe,GAAGA;QACvB,IAAI,CAACC,MAAM,GAAGG,cAAcN,cAAcQ,IAAI;QAC9C,IAAI,CAACP,aAAa,GAAGM;IACvB;IAEAE,cAAc;QACZ,MAAML,WAAW,IAAI,CAACA,QAAQ;QAC9B,IAAI,CAACA,UAAU,MAAM,IAAIM,0CAAuB,CAAC;QACjD,OAAOC,OAAOC,MAAM,CAAC;YAEnB,CAACC,0CAAiB,CAAC,EAAE;gBACnBC,eAAeV,QAAQ,CAACS,0CAAiB,CAAC,CAACC,aAAa;gBACxDC,cAAcX,QAAQ,CAACS,0CAAiB,CAAC,CAACE,YAAY;gBACtDC,0BAA0BZ,QAAQ,CAACS,0CAAiB,CAAC,CAACG,wBAAwB;gBAC9EC,8BAA8Bb,QAAQ,CAACS,0CAAiB,CAAC,CAACI,4BAA4B;gBACtFC,4BAA4B,IAAI,CAACjB,aAAa;gBAC9CkB,2BAA2Bf,QAAQ,CAACS,0CAAiB,CAAC,CAACM,yBAAyB;YAClF;YACA,CAACC,yCAAgB,CAAC,EAAEhB,QAAQ,CAACgB,yCAAgB,CAAC;YAC9C,CAACC,2CAAkB,CAAC,EAAEjB,QAAQ,CAACiB,2CAAkB,CAAC;YAClD,CAACC,mDAA0B,CAAC,EAAElB,QAAQ,CAACkB,mDAA0B,CAAC;YAClE,CAACC,0CAAiB,CAAC,EAAEnB,QAAQ,CAACmB,0CAAiB,CAAC;QAClD;IACF;IAEAC,uBAAuB;QACrB,MAAMpB,WAAW,IAAI,CAACA,QAAQ;QAC9B,IAAI,CAACA,UAAU,MAAM,IAAIM,0CAAuB,CAAC;QACjD,OAAOC,OAAOC,MAAM,CAAC;YACnB,CAACa,8CAAqB,CAAC,EAAE;gBACvBC,cAActB,QAAQ,CAACqB,8CAAqB,CAAC,CAACC,YAAY;gBAC1DC,sBAAsBvB,QAAQ,CAACqB,8CAAqB,CAAC,CAACE,oBAAoB;gBAC1EC,oBAAoBxB,QAAQ,CAACqB,8CAAqB,CAAC,CAACG,kBAAkB;YACxE;YACA,CAACf,0CAAiB,CAAC,EAAE;gBACnBgB,eAAezB,QAAQ,CAACS,0CAAiB,CAAC,CAACgB,aAAa;gBACxDC,kBAAkB1B,QAAQ,CAACS,0CAAiB,CAAC,CAACiB,gBAAgB;gBAC9DC,wBAAwB3B,QAAQ,CAACS,0CAAiB,CAAC,CAACkB,sBAAsB;gBAC1Ed,8BAA8Bb,QAAQ,CAACS,0CAAiB,CAAC,CAACI,4BAA4B;gBACtFC,4BAA4B,IAAI,CAACjB,aAAa;gBAC9CkB,2BAA2Bf,QAAQ,CAACS,0CAAiB,CAAC,CAACM,yBAAyB;YAClF;QACF;IACF;IAEAa,4BAA4B;QAC1B,OAAO,IAAI,CAACR,oBAAoB,EAAE,CAACX,0CAAiB,CAAC,CAACgB,aAAa;IACrE;IAEA,MAAMI,eAAe;QAEnB,IAAI,CAAC7B,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAACgC,WAAW;QACtD,MAAM,IAAI,CAACC,oBAAoB;IACjC;IAEA,MAAMC,wBAAwB;QAC5B,OAAO,IAAI,CAAChC,QAAQ,CAACqB,8CAAqB,CAAC;IAC7C;IAEA,MAAMY,iCAAiC;QACrC,OAAO,IAAI,CAACjC,QAAQ,CAACS,0CAAiB,CAAC,CAACG,wBAAwB;IAClE;IAEA,MAAMsB,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;gBAClCf,cAAciB,SAASH;YACzB;QACF;IACF;IAEAI,iBAAiB;QACf,OAAO;YACLC,iBAAiB,IAAI,CAACzC,QAAQ,CAACgB,yCAAgB,CAAC,CAACyB,eAAe;YAChEC,eAAe,IAAI,CAAC1C,QAAQ,CAACgB,yCAAgB,CAAC,CAAC0B,aAAa;YAC5DC,qBAAqBC,6BAAY,CAACC,oBAAoB;QACxD;IACF;IAEAC,oBAAoB;QAClB,OACE,IAAI,CAAC9C,QAAQ,CAACgB,yCAAgB,CAAC,CAACyB,eAAe,IAC/C,IAAI,CAACzC,QAAQ,CAACgB,yCAAgB,CAAC,CAAC0B,aAAa,KAAKE,6BAAY,CAACC,oBAAoB;IAEvF;IAEAE,oBAAoB;QAClB,OAAO,IAAI,CAAC/C,QAAQ,CAACgB,yCAAgB,CAAC;IACxC;IAEAgC,wBAAwB;QACtB,IAAI,CAAC,IAAI,CAAChD,QAAQ,EAAE,MAAM,IAAIM,0CAAuB,CAAC;QACtD,OAAO,IAAI,CAACN,QAAQ,CAACS,0CAAiB,CAAC,CAACE,YAAY;IACtD;IAEAsC,oBAAoB;QAClB,OAAO,IAAI,CAAC5C,WAAW,EAAE,CAACI,0CAAiB,CAAC;IAC9C;IAEAyC,sBAAsB;QACpB,OAAO,IAAI,CAAC7C,WAAW,EAAE,CAACY,2CAAkB,CAAC;IAC/C;IAEAkC,uBAAuB;QACrB,OAAO,IAAI,CAAC9C,WAAW,EAAE,CAACa,mDAA0B,CAAC;IACvD;IAEAkC,8BAA8B;QAC5B,OAAO,IAAI,CAAC/C,WAAW,EAAE,CAACa,mDAA0B,CAAC,EAAEmC;IACzD;IAEA,MAAMC,mBAAmBC,OAAe,EAAE;QACxC,IAAI,CAACvD,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC0D,mBAAmB,CAAC;YAC7Df,iBAAiB;YACjBgB,mBAAmB,IAAIC;YACvBhB,eAAea;QACjB;QACA,OAAO,IAAI,CAAClD,WAAW;IACzB;IAEA,MAAMsD,uBAAuBhD,eAAe,IAAI,EAAE;QAChD,IAAI,CAACX,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC8D,mBAAmB,CAAC;YAC7DjD;QACF;QACA,OAAO,IAAI,CAACN,WAAW;IACzB;IAEA,MAAMwD,mBAAmB;QACvB,OAAO,IAAI,CAACZ,iBAAiB,GAAGvC,aAAa;IAC/C;IAEA,MAAMoD,iBAAiBpD,gBAAgB,IAAI,EAAE;QAC3C,IAAI,CAACV,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC8D,mBAAmB,CAAC;YAC7DlD;QACF;QACA,OAAO,IAAI,CAACL,WAAW;IACzB;IAEA,MAAM0D,aAAarC,mBAAmB,IAAI,EAAEC,sBAAgC,EAAE;QAC5E,IAAI,CAAC3B,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC8D,mBAAmB,CAAC;YAC7DlC;YACAC;QACF;QACA,OAAO,IAAI,CAACtB,WAAW;IACzB;IAEA,MAAM2D,qBAAqBC,cAA0C,EAAE;QACrE,IAAI,CAACjE,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC8D,mBAAmB,CAACK;QAC/D,OAAO,IAAI,CAAC5D,WAAW;IACzB;IAEA,MAAM6D,sBAAsBC,eAAmC,EAAE;QAC/D,IAAI,CAACnE,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAACoE,qBAAqB,CAACC;QACjE,OAAO,IAAI,CAAC9D,WAAW;IACzB;IAEA,MAAM+D,uBAAuBC,SAAwC,EAAE;QACrE,IAAI,CAACrE,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAACsE,sBAAsB,CAACC;QAClE,OAAO,IAAI,CAAChE,WAAW;IACzB;IAEA,MAAMgC,yBAAyBiC,kBAAkD,EAAE;QACjF,IAAI,CAACtE,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAACyE,uBAAuB,CAACD;QACnE,OAAO,IAAI,CAACjE,WAAW;IACzB;IAEA,MAAMmE,4BAA4B5D,wBAAiC,EAAE;QACnE,IAAI,CAACZ,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC8D,mBAAmB,CAAC;YAC7DhD;QACF;QACA,MAAM,IAAI,CAACmB,oBAAoB;QAC/B,OAAO,IAAI,CAAC1B,WAAW;IACzB;IAEA,MAAMoE,gCAAgCC,gBAAyB,EAAE;QAC/D,IAAI,CAAC1E,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC8D,mBAAmB,CAAC;YAC7D/C,8BAA8B6D;QAChC;QACA,OAAO,IAAI,CAACrE,WAAW;IACzB;IAEA,MAAMsE,6BAA6BC,yBAAkC,EAAE;QACrE,IAAI,CAAC5E,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC8D,mBAAmB,CAAC;YAC7D7C,2BAA2B6D;QAC7B;QACA,OAAO,IAAI,CAACvE,WAAW;IACzB;IAEA,MAAMwE,uBAAuBC,gBAAqC,EAAE;QAClE,IAAI,CAAC9E,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC+E,sBAAsB,CAACC;QAClE,OAAO,IAAI,CAACzE,WAAW;IACzB;IAEA,MAAc0B,uBAAuB;QACnC,MAAMgD,gBAAgB,MAAM,IAAI,CAAC9C,8BAA8B;QAC/D,IAAI8C,eAAe;YACjB,IAAI,CAAChF,MAAM,CAACiF,GAAG,CAAC;QAClB,OAAO;YACL,IAAI,CAACjF,MAAM,CAACiF,GAAG,CAAC;QAClB;QAEA,IAAIC,IAAAA,2BAAiB,KAAI;QACzB,MAAMC,SAASC,IAAAA,mBAAa,IAAGC,SAAS;QACxC,IAAI,CAACF,QAAQ;YACX,IAAI,CAACnF,MAAM,CAACsF,IAAI,CAAC;YACjB;QACF;QACAH,OAAOI,UAAU,GAAGC,OAAO,GAAGR;IAChC;AACF"}
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.6.4",
9
+ "version": "1.7.0",
10
10
  "bin": {
11
11
  "fdm-monster": "dist/index.js",
12
12
  "fdmm": "dist/index.js"
@@ -17,9 +17,10 @@
17
17
  "console:upload": "yarn build && cross-env NODE_ENV=development node ./dist/consoles/upload-test.js",
18
18
  "dev": "concurrently \"yarn build:watch\" \"yarn watch-dev\"",
19
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",
20
22
  "console:torm": "yarn build && cross-env NODE_ENV=development nodemon --watch \"dist/**/*\" -e js ./dist/consoles/sqlite-torm.js",
21
23
  "console:migrate": "yarn build && cross-env NODE_ENV=development nodemon --watch \"dist/**/*\" -e js ./dist/consoles/typeorm-migrate.js",
22
- "console:generate": "yarn build && cross-env NODE_ENV=development node ./dist/consoles/typeorm-generate.js",
23
24
  "build": "swc src -d dist --strip-leading-paths",
24
25
  "build:watch": "swc src -w -d dist --strip-leading-paths",
25
26
  "start:dev": "ts-node src/index.ts",
@@ -52,17 +53,18 @@
52
53
  "vue"
53
54
  ],
54
55
  "dependencies": {
55
- "@fdm-monster/client": "1.6.1",
56
+ "@fdm-monster/client": "1.6.5",
57
+ "@fdm-monster/client-next": "0.0.3",
56
58
  "@influxdata/influxdb-client": "1.35.0",
57
59
  "@octokit/plugin-throttling": "8.2.0",
58
- "@sentry/node": "8.35.0",
60
+ "@sentry/node": "8.36.0",
59
61
  "adm-zip": "0.5.16",
60
62
  "awilix": "12.0.3",
61
63
  "awilix-express": "9.0.1",
62
64
  "axios": "1.7.7",
63
65
  "bcryptjs": "2.4.3",
64
66
  "better-sqlite3": "11.5.0",
65
- "cache-manager": "4.1.0",
67
+ "cache-manager": "6.1.2",
66
68
  "class-validator": "0.14.1",
67
69
  "connect-history-api-fallback": "2.0.0",
68
70
  "cookie-parser": "1.4.7",
@@ -93,17 +95,17 @@
93
95
  "socket.io": "4.8.1",
94
96
  "toad-scheduler": "3.0.1",
95
97
  "typeorm": "0.3.20",
96
- "uuid": "10.0.0",
98
+ "uuid": "11.0.2",
97
99
  "winston": "3.15.0",
98
100
  "ws": "8.18.0"
99
101
  },
100
102
  "devDependencies": {
101
103
  "@lcov-viewer/cli": "1.3.0",
102
104
  "@lcov-viewer/istanbul-report": "1.4.0",
103
- "@swc/cli": "0.4.0",
104
- "@swc/core": "1.7.40",
105
- "@swc/jest": "0.2.36",
106
- "@types/adm-zip": "0.5.5",
105
+ "@swc/cli": "0.5.0",
106
+ "@swc/core": "1.7.42",
107
+ "@swc/jest": "0.2.37",
108
+ "@types/adm-zip": "0.5.6",
107
109
  "@types/bcryptjs": "2.4.6",
108
110
  "@types/cache-manager": "4.0.6",
109
111
  "@types/connect-history-api-fallback": "1.5.4",
@@ -112,11 +114,11 @@
112
114
  "@types/ip": "1.1.3",
113
115
  "@types/jest": "29.5.14",
114
116
  "@types/js-yaml": "4.0.9",
115
- "@types/lodash": "4.17.12",
117
+ "@types/lodash": "4.17.13",
116
118
  "@types/luxon": "3.4.2",
117
119
  "@types/migrate-mongo": "10.0.5",
118
120
  "@types/multer": "1.4.12",
119
- "@types/node": "20.17.1",
121
+ "@types/node": "22.8.6",
120
122
  "@types/passport-anonymous": "1.0.5",
121
123
  "@types/passport-jwt": "4.0.1",
122
124
  "@types/semver": "7.5.8",
@@ -130,7 +132,7 @@
130
132
  "eslint-config-prettier": "9.1.0",
131
133
  "eslint-config-standard": "17.1.0",
132
134
  "eslint-plugin-import": "2.31.0",
133
- "eslint-plugin-n": "17.11.1",
135
+ "eslint-plugin-n": "17.12.0",
134
136
  "eslint-plugin-prettier": "4.2.1",
135
137
  "eslint-plugin-promise": "7.1.0",
136
138
  "express-list-routes": "1.2.4",
@@ -0,0 +1,7 @@
1
+ ### GET request to OctoPrint plugins
2
+
3
+ GET http://{{env-op}}/plugin/pluginmanager/plugins
4
+ ?generated-in=WebStorm
5
+ x-api-key: {{api-key}}
6
+
7
+ ###
package/tsconfig.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "compilerOptions": {
3
- "target": "es2021",
3
+ "target": "es2022",
4
4
  "module": "commonjs",
5
5
  "allowJs": true,
6
6
  "removeComments": true,
@@ -9,7 +9,7 @@
9
9
  "sourceMap": true,
10
10
  "outDir": "dist",
11
11
  "strict": true,
12
- "lib": ["es2021"],
12
+ "lib": ["es2022"],
13
13
  "baseUrl": "./src",
14
14
  "forceConsistentCasingInFileNames": true,
15
15
  "esModuleInterop": true,
@@ -1,21 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", {
3
- value: true
4
- });
5
- Object.defineProperty(exports, "ConnectionStateDto", {
6
- enumerable: true,
7
- get: function() {
8
- return ConnectionStateDto;
9
- }
10
- });
11
- class ConnectionStateDto {
12
- correlationId;
13
- socketState;
14
- apiState;
15
- apiStateUpdateTimestamp;
16
- stateUpdateTimestamp;
17
- lastMessageReceivedTimestamp;
18
- reauthRequiredTimestamp;
19
- }
20
-
21
- //# sourceMappingURL=connection-state.dto.js.map
@@ -1 +0,0 @@
1
- {"version":3,"sources":["../../../../../src/services/octoprint/dto/connection/connection-state.dto.ts"],"names":["ConnectionStateDto","correlationId","socketState","apiState","apiStateUpdateTimestamp","stateUpdateTimestamp","lastMessageReceivedTimestamp","reauthRequiredTimestamp"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;IACXC,cAAsB;IACtBC,YAAyB;IACzBC,SAAmB;IACnBC,wBAAgC;IAChCC,qBAA6B;IAC7BC,6BAAqC;IACrCC,wBAAgC;AAClC"}