@fdm-monster/server 1.7.3 → 1.7.5

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 (46) hide show
  1. package/.env.template +0 -3
  2. package/.yarn/install-state.gz +0 -0
  3. package/.yarn/releases/{yarn-4.5.1.cjs → yarn-4.5.2.cjs} +292 -292
  4. package/.yarnrc.yml +1 -1
  5. package/RELEASE_NOTES.MD +22 -1
  6. package/dist/constants/server-settings.constants.js +0 -9
  7. package/dist/constants/server-settings.constants.js.map +1 -1
  8. package/dist/controllers/auth.controller.js +1 -1
  9. package/dist/controllers/auth.controller.js.map +1 -1
  10. package/dist/controllers/settings.controller.js +1 -20
  11. package/dist/controllers/settings.controller.js.map +1 -1
  12. package/dist/controllers/user.controller.js +32 -0
  13. package/dist/controllers/user.controller.js.map +1 -1
  14. package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
  15. package/dist/controllers/validation/generic.validation.js +1 -1
  16. package/dist/controllers/validation/generic.validation.js.map +1 -1
  17. package/dist/controllers/validation/user-controller.validation.js +18 -3
  18. package/dist/controllers/validation/user-controller.validation.js.map +1 -1
  19. package/dist/entities/settings.entity.js.map +1 -1
  20. package/dist/middleware/global.middleware.js +1 -25
  21. package/dist/middleware/global.middleware.js.map +1 -1
  22. package/dist/models/Settings.js +0 -10
  23. package/dist/models/Settings.js.map +1 -1
  24. package/dist/server.constants.js +1 -2
  25. package/dist/server.constants.js.map +1 -1
  26. package/dist/server.core.js +1 -1
  27. package/dist/server.core.js.map +1 -1
  28. package/dist/services/interfaces/settings.dto.js +3 -15
  29. package/dist/services/interfaces/settings.dto.js.map +1 -1
  30. package/dist/services/mongoose/settings.service.js +10 -30
  31. package/dist/services/mongoose/settings.service.js.map +1 -1
  32. package/dist/services/octoprint/octoprint-websocket.adapter.js +2 -1
  33. package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
  34. package/dist/services/orm/settings.service.js +9 -27
  35. package/dist/services/orm/settings.service.js.map +1 -1
  36. package/dist/services/validators/settings-service.validation.js +8 -19
  37. package/dist/services/validators/settings-service.validation.js.map +1 -1
  38. package/dist/state/printer-events.cache.js.map +1 -1
  39. package/dist/state/printer.cache.js.map +1 -1
  40. package/dist/state/settings.store.js +0 -9
  41. package/dist/state/settings.store.js.map +1 -1
  42. package/dist/state/test-printer-socket.store.js +6 -0
  43. package/dist/state/test-printer-socket.store.js.map +1 -1
  44. package/dist/utils/cache/key-diff.cache.js +3 -0
  45. package/dist/utils/cache/key-diff.cache.js.map +1 -1
  46. package/package.json +12 -13
@@ -12,8 +12,6 @@ const _models = require("../../models");
12
12
  const _serversettingsconstants = require("../../constants/server-settings.constants");
13
13
  const _validators = require("../../handlers/validators");
14
14
  const _settingsservicevalidation = require("../validators/settings-service.validation");
15
- const _serverconstants = require("../../server.constants");
16
- const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
17
15
  class SettingsService {
18
16
  configService;
19
17
  constructor({ configService }){
@@ -65,16 +63,19 @@ class SettingsService {
65
63
  }
66
64
  if (!doc[_serversettingsconstants.serverSettingsKey]) {
67
65
  doc[_serversettingsconstants.serverSettingsKey] = (0, _serversettingsconstants.getDefaultServerSettings)();
66
+ } else {
67
+ doc[_serversettingsconstants.serverSettingsKey] = {
68
+ debugSettings: doc[_serversettingsconstants.serverSettingsKey].debugSettings,
69
+ loginRequired: doc[_serversettingsconstants.serverSettingsKey].loginRequired,
70
+ registration: doc[_serversettingsconstants.serverSettingsKey].registration,
71
+ experimentalClientSupport: doc[_serversettingsconstants.serverSettingsKey].experimentalClientSupport,
72
+ experimentalMoonrakerSupport: doc[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
73
+ sentryDiagnosticsEnabled: doc[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled
74
+ };
68
75
  }
69
76
  if (!doc[_serversettingsconstants.credentialSettingsKey]) {
70
77
  doc[_serversettingsconstants.credentialSettingsKey] = (0, _serversettingsconstants.getDefaultCredentialSettings)();
71
78
  }
72
- if (!this.isWhiteListSettingEnabled()) {
73
- doc.server.whitelistEnabled = false;
74
- doc.server.whitelistedIpAddresses = (0, _serversettingsconstants.getDefaultWhitelistIpAddresses)();
75
- } else if (!doc.server.whitelistedIpAddresses?.length) {
76
- doc.server.whitelistedIpAddresses = (0, _serversettingsconstants.getDefaultWhitelistIpAddresses)();
77
- }
78
79
  if (!doc[_serversettingsconstants.frontendSettingKey]) {
79
80
  doc[_serversettingsconstants.frontendSettingKey] = (0, _serversettingsconstants.getDefaultFrontendSettings)();
80
81
  }
@@ -100,24 +101,6 @@ class SettingsService {
100
101
  new: true
101
102
  });
102
103
  }
103
- async setWhitelist(enabled, ipAddresses) {
104
- if (!this.isWhiteListSettingEnabled()) {
105
- throw new _runtimeexceptions.BadRequestException("Whitelist settings are not enabled");
106
- }
107
- await (0, _validators.validateInput)({
108
- whitelistEnabled: enabled,
109
- whitelistedIpAddresses: ipAddresses
110
- }, _settingsservicevalidation.whitelistSettingUpdateRules);
111
- const settingsDoc = await this.getOrCreate();
112
- const settings = settingsDoc[_serversettingsconstants.serverSettingsKey];
113
- settings.whitelistEnabled = enabled;
114
- settings.whitelistedIpAddresses = ipAddresses;
115
- return _models.Settings.findOneAndUpdate({
116
- _id: settingsDoc.id
117
- }, settingsDoc, {
118
- new: true
119
- });
120
- }
121
104
  async updateFrontendSettings(patchUpdate) {
122
105
  const validatedInput = await (0, _validators.validateInput)(patchUpdate, _settingsservicevalidation.frontendSettingsUpdateRules);
123
106
  const settingsDoc = await this.getOrCreate();
@@ -141,7 +124,7 @@ class SettingsService {
141
124
  });
142
125
  }
143
126
  async patchServerSettings(patchUpdate) {
144
- const validatedInput = await (0, _validators.validateInput)(patchUpdate, (0, _settingsservicevalidation.serverSettingsUpdateRules)(this.isWhiteListSettingEnabled()));
127
+ const validatedInput = await (0, _validators.validateInput)(patchUpdate, _settingsservicevalidation.serverSettingsUpdateRules);
145
128
  const settingsDoc = await this.getOrCreate();
146
129
  const serverSettings = settingsDoc[_serversettingsconstants.serverSettingsKey];
147
130
  Object.assign(serverSettings, validatedInput);
@@ -162,9 +145,6 @@ class SettingsService {
162
145
  new: true
163
146
  });
164
147
  }
165
- isWhiteListSettingEnabled() {
166
- return this.configService.get(_serverconstants.AppConstants.ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS, "false") === "true";
167
- }
168
148
  }
169
149
 
170
150
  //# sourceMappingURL=settings.service.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/services/mongoose/settings.service.ts"],"names":["SettingsService","configService","constructor","toDto","entity","serverSettingsKey","experimentalTypeormSupport","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey","getOrCreate","settings","Settings","findOne","defaultSettings","getDefaultSettings","save","migrateSettingsRuntime","findOneAndUpdate","_id","id","new","knownSettings","doc","getDefaultFileCleanSettings","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","getDefaultWizardSettings","getDefaultTimeout","getDefaultServerSettings","credentialSettingsKey","getDefaultCredentialSettings","isWhiteListSettingEnabled","server","whitelistEnabled","whitelistedIpAddresses","getDefaultWhitelistIpAddresses","length","getDefaultFrontendSettings","patchFileCleanSettings","patchUpdate","validatedInput","validateInput","fileCleanSettingsUpdateRules","settingsDoc","Object","assign","patchWizardSettings","wizardUpdateRules","setWhitelist","enabled","ipAddresses","BadRequestException","whitelistSettingUpdateRules","updateFrontendSettings","frontendSettingsUpdateRules","frontendSettings","patchCredentialSettings","credentialSettingPatchRules","credentialSettings","patchServerSettings","serverSettingsUpdateRules","serverSettings","updateTimeoutSettings","timeoutSettingsUpdateRules","timeoutSettings","get","AppConstants","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS"],"mappings":";;;;+BA2CaA;;;eAAAA;;;wBA3CY;yCAgBlB;4BACuB;2CASvB;iCAasB;mCAEO;AAE7B,MAAMA;IACXC,cAA6B;IAC7BC,YAAY,EAAED,aAAa,EAAoC,CAAE;QAC/D,IAAI,CAACA,aAAa,GAAGA;IACvB;IAEAE,MAAMC,MAAiB,EAA4B;QACjD,OAAO;YAEL,CAACC,0CAAiB,CAAC,EAAE;gBACnB,GAAGD,MAAM,CAACC,0CAAiB,CAAC;gBAC5BC,4BAA4B;YAC9B;YACA,CAACC,yCAAgB,CAAC,EAAEH,MAAM,CAACG,yCAAgB,CAAC;YAC5C,CAACC,2CAAkB,CAAC,EAAEJ,MAAM,CAACI,2CAAkB,CAAC;YAChD,CAACC,mDAA0B,CAAC,EAAEL,MAAM,CAACK,mDAA0B,CAAC;YAChE,CAACC,0CAAiB,CAAC,EAAEN,MAAM,CAACM,0CAAiB,CAAC;QAChD;IACF;IAEA,MAAMC,cAAc;QAClB,IAAIC,WAAW,MAAMC,gBAAQ,CAACC,OAAO;QACrC,IAAI,CAACF,UAAU;YACb,MAAMG,kBAAkB,IAAIF,gBAAQ,CAACG,IAAAA,2CAAkB;YACvD,MAAMD,gBAAgBE,IAAI;YAG1B,OAAOF;QACT,OAAO;YAELH,WAAW,IAAI,CAACM,sBAAsB,CAACN;YAEvC,OAAOC,gBAAQ,CAACM,gBAAgB,CAAC;gBAAEC,KAAKR,SAASS,EAAE;YAAC,GAAGT,UAAU;gBAAEU,KAAK;YAAK;QAC/E;IACF;IAKAJ,uBAAuBK,aAAgD,EAAE;QACvE,MAAMC,MAAMD;QACZ,IAAI,CAACC,GAAG,CAACf,mDAA0B,CAAC,EAAE;YACpCe,GAAG,CAACf,mDAA0B,CAAC,GAAGgB,IAAAA,oDAA2B;QAC/D,OAAO;YAELD,GAAG,CAACf,mDAA0B,CAAC,GAAG;gBAChCiB,gCAAgCF,GAAG,CAACf,mDAA0B,CAAC,CAACiB,8BAA8B;gBAC9FC,0BAA0BH,GAAG,CAACf,mDAA0B,CAAC,CAACiB,8BAA8B;gBACxFE,iCAAiCJ,GAAG,CAACf,mDAA0B,CAAC,CAACmB,+BAA+B;YAClG;QACF;QAGA,IAAI,CAACJ,GAAG,CAACjB,yCAAgB,CAAC,EAAE;YAC1BiB,GAAG,CAACjB,yCAAgB,CAAC,GAAGsB,IAAAA,iDAAwB;QAClD;QACA,IAAI,CAACL,GAAG,CAACd,0CAAiB,CAAC,EAAE;YAC3Bc,GAAG,CAACd,0CAAiB,CAAC,GAAGoB,IAAAA,0CAAiB;QAC5C;QACA,IAAI,CAACN,GAAG,CAACnB,0CAAiB,CAAC,EAAE;YAC3BmB,GAAG,CAACnB,0CAAiB,CAAC,GAAG0B,IAAAA,iDAAwB;QACnD;QACA,IAAI,CAACP,GAAG,CAACQ,8CAAqB,CAAC,EAAE;YAC/BR,GAAG,CAACQ,8CAAqB,CAAC,GAAGC,IAAAA,qDAA4B;QAC3D;QACA,IAAI,CAAC,IAAI,CAACC,yBAAyB,IAAI;YACrCV,IAAIW,MAAM,CAACC,gBAAgB,GAAG;YAC9BZ,IAAIW,MAAM,CAACE,sBAAsB,GAAGC,IAAAA,uDAA8B;QACpE,OAAO,IAAI,CAACd,IAAIW,MAAM,CAACE,sBAAsB,EAAEE,QAAQ;YACrDf,IAAIW,MAAM,CAACE,sBAAsB,GAAGC,IAAAA,uDAA8B;QACpE;QACA,IAAI,CAACd,GAAG,CAAChB,2CAAkB,CAAC,EAAE;YAC5BgB,GAAG,CAAChB,2CAAkB,CAAC,GAAGgC,IAAAA,mDAA0B;QACtD;QAEA,OAAOjB;IACT;IAEA,MAAMkB,uBAAuBC,WAAwC,EAAE;QACrE,MAAMC,iBAAiB,MAAMC,IAAAA,yBAAa,EAACF,aAAaG,uDAA4B;QAEpF,MAAMC,cAAc,MAAM,IAAI,CAACnC,WAAW;QAC1CmC,WAAW,CAACrC,mDAA0B,CAAC,GAAGsC,OAAOC,MAAM,CAACF,WAAW,CAACrC,mDAA0B,CAAC,EAAEkC;QACjG,OAAO9B,gBAAQ,CAACM,gBAAgB,CAAC;YAAEC,KAAK0B,YAAYzB,EAAE;QAAC,GAAGyB,aAAa;YACrExB,KAAK;QACP;IACF;IAEA,MAAM2B,oBAAoBP,WAAqC,EAAE;QAC/D,MAAMC,iBAAiB,MAAMC,IAAAA,yBAAa,EAACF,aAAaQ,4CAAiB;QAEzE,MAAMJ,cAAc,MAAM,IAAI,CAACnC,WAAW;QAC1CmC,WAAW,CAACvC,yCAAgB,CAAC,GAAGwC,OAAOC,MAAM,CAACF,WAAW,CAACvC,yCAAgB,CAAC,EAAEoC;QAC7E,OAAO9B,gBAAQ,CAACM,gBAAgB,CAAC;YAAEC,KAAK0B,YAAYzB,EAAE;QAAC,GAAGyB,aAAa;YACrExB,KAAK;QACP;IACF;IAEA,MAAM6B,aAAaC,OAAgB,EAAEC,WAAqB,EAAE;QAC1D,IAAI,CAAC,IAAI,CAACnB,yBAAyB,IAAI;YACrC,MAAM,IAAIoB,sCAAmB,CAAC;QAChC;QAEA,MAAMV,IAAAA,yBAAa,EACjB;YACER,kBAAkBgB;YAClBf,wBAAwBgB;QAC1B,GACAE,sDAA2B;QAE7B,MAAMT,cAAc,MAAM,IAAI,CAACnC,WAAW;QAC1C,MAAMC,WAAWkC,WAAW,CAACzC,0CAAiB,CAAC;QAC/CO,SAASwB,gBAAgB,GAAGgB;QAC5BxC,SAASyB,sBAAsB,GAAGgB;QAClC,OAAOxC,gBAAQ,CAACM,gBAAgB,CAAC;YAAEC,KAAK0B,YAAYzB,EAAE;QAAC,GAAGyB,aAAa;YACrExB,KAAK;QACP;IACF;IAEA,MAAMkC,uBAAuBd,WAA8B,EAAE;QAC3D,MAAMC,iBAAiB,MAAMC,IAAAA,yBAAa,EAACF,aAAae,sDAA2B;QAEnF,MAAMX,cAAc,MAAM,IAAI,CAACnC,WAAW;QAC1C,MAAM+C,mBAAmBZ,WAAW,CAACtC,2CAAkB,CAAC;QACxDuC,OAAOC,MAAM,CAACU,kBAAkBf;QAChC,OAAO9B,gBAAQ,CAACM,gBAAgB,CAAC;YAAEC,KAAK0B,YAAYzB,EAAE;QAAC,GAAGyB,aAAa;YACrExB,KAAK;QACP;IACF;IAEA,MAAMqC,wBAAwBjB,WAAyC,EAAE;QACvE,MAAMC,iBAAiB,MAAMC,IAAAA,yBAAa,EAACF,aAAakB,sDAA2B;QAEnF,MAAMd,cAAc,MAAM,IAAI,CAACnC,WAAW;QAC1C,MAAMkD,qBAAqBf,WAAW,CAACd,8CAAqB,CAAC;QAC7De,OAAOC,MAAM,CAACa,oBAAoBlB;QAClC,OAAO9B,gBAAQ,CAACM,gBAAgB,CAAC;YAAEC,KAAK0B,YAAYzB,EAAE;QAAC,GAAGyB,aAAa;YACrExB,KAAK;QACP;IACF;IAEA,MAAMwC,oBAAoBpB,WAAqC,EAAE;QAC/D,MAAMC,iBAAiB,MAAMC,IAAAA,yBAAa,EAACF,aAAaqB,IAAAA,oDAAyB,EAAC,IAAI,CAAC7B,yBAAyB;QAEhH,MAAMY,cAAc,MAAM,IAAI,CAACnC,WAAW;QAC1C,MAAMqD,iBAAiBlB,WAAW,CAACzC,0CAAiB,CAAC;QACrD0C,OAAOC,MAAM,CAACgB,gBAAgBrB;QAC9B,OAAO9B,gBAAQ,CAACM,gBAAgB,CAAC;YAAEC,KAAK0B,YAAYzB,EAAE;QAAC,GAAGyB,aAAa;YACrExB,KAAK;QACP;IACF;IAEA,MAAM2C,sBAAsBvB,WAAsC,EAAE;QAClE,MAAMC,iBAAiB,MAAMC,IAAAA,yBAAa,EAACF,aAAawB,qDAA0B;QAElF,MAAMpB,cAAc,MAAM,IAAI,CAACnC,WAAW;QAC1C,MAAMwD,kBAAkBrB,WAAW,CAACpC,0CAAiB,CAAC;QACtDqC,OAAOC,MAAM,CAACmB,iBAAiBxB;QAC/B,OAAO9B,gBAAQ,CAACM,gBAAgB,CAAC;YAAEC,KAAK0B,YAAYzB,EAAE;QAAC,GAAGyB,aAAa;YACrExB,KAAK;QACP;IACF;IAEAY,4BAA4B;QAC1B,OAAO,IAAI,CAACjC,aAAa,CAACmE,GAAG,CAACC,6BAAY,CAACC,sCAAsC,EAAE,aAAa;IAClG;AACF"}
1
+ {"version":3,"sources":["../../../src/services/mongoose/settings.service.ts"],"names":["SettingsService","configService","constructor","toDto","entity","serverSettingsKey","experimentalTypeormSupport","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey","getOrCreate","settings","Settings","findOne","defaultSettings","getDefaultSettings","save","migrateSettingsRuntime","findOneAndUpdate","_id","id","new","knownSettings","doc","getDefaultFileCleanSettings","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","getDefaultWizardSettings","getDefaultTimeout","getDefaultServerSettings","debugSettings","loginRequired","registration","experimentalClientSupport","experimentalMoonrakerSupport","sentryDiagnosticsEnabled","credentialSettingsKey","getDefaultCredentialSettings","getDefaultFrontendSettings","patchFileCleanSettings","patchUpdate","validatedInput","validateInput","fileCleanSettingsUpdateRules","settingsDoc","Object","assign","patchWizardSettings","wizardUpdateRules","updateFrontendSettings","frontendSettingsUpdateRules","frontendSettings","patchCredentialSettings","credentialSettingPatchRules","credentialSettings","patchServerSettings","serverSettingsUpdateRules","serverSettings","updateTimeoutSettings","timeoutSettingsUpdateRules","timeoutSettings"],"mappings":";;;;+BAyCaA;;;eAAAA;;;wBAzCY;yCAelB;4BACuB;2CAQvB;AAiBA,MAAMA;IACXC,cAA6B;IAC7BC,YAAY,EAAED,aAAa,EAAoC,CAAE;QAC/D,IAAI,CAACA,aAAa,GAAGA;IACvB;IAEAE,MAAMC,MAAiB,EAA4B;QACjD,OAAO;YAEL,CAACC,0CAAiB,CAAC,EAAE;gBACnB,GAAGD,MAAM,CAACC,0CAAiB,CAAC;gBAC5BC,4BAA4B;YAC9B;YACA,CAACC,yCAAgB,CAAC,EAAEH,MAAM,CAACG,yCAAgB,CAAC;YAC5C,CAACC,2CAAkB,CAAC,EAAEJ,MAAM,CAACI,2CAAkB,CAAC;YAChD,CAACC,mDAA0B,CAAC,EAAEL,MAAM,CAACK,mDAA0B,CAAC;YAChE,CAACC,0CAAiB,CAAC,EAAEN,MAAM,CAACM,0CAAiB,CAAC;QAChD;IACF;IAEA,MAAMC,cAAc;QAClB,IAAIC,WAAW,MAAMC,gBAAQ,CAACC,OAAO;QACrC,IAAI,CAACF,UAAU;YACb,MAAMG,kBAAkB,IAAIF,gBAAQ,CAACG,IAAAA,2CAAkB;YACvD,MAAMD,gBAAgBE,IAAI;YAG1B,OAAOF;QACT,OAAO;YAELH,WAAW,IAAI,CAACM,sBAAsB,CAACN;YAEvC,OAAOC,gBAAQ,CAACM,gBAAgB,CAAC;gBAAEC,KAAKR,SAASS,EAAE;YAAC,GAAGT,UAAU;gBAAEU,KAAK;YAAK;QAC/E;IACF;IAKAJ,uBAAuBK,aAAiC,EAAE;QACxD,MAAMC,MAAMD;QACZ,IAAI,CAACC,GAAG,CAACf,mDAA0B,CAAC,EAAE;YACpCe,GAAG,CAACf,mDAA0B,CAAC,GAAGgB,IAAAA,oDAA2B;QAC/D,OAAO;YAELD,GAAG,CAACf,mDAA0B,CAAC,GAAG;gBAChCiB,gCAAgCF,GAAG,CAACf,mDAA0B,CAAC,CAACiB,8BAA8B;gBAC9FC,0BAA0BH,GAAG,CAACf,mDAA0B,CAAC,CAACiB,8BAA8B;gBACxFE,iCAAiCJ,GAAG,CAACf,mDAA0B,CAAC,CAACmB,+BAA+B;YAClG;QACF;QAGA,IAAI,CAACJ,GAAG,CAACjB,yCAAgB,CAAC,EAAE;YAC1BiB,GAAG,CAACjB,yCAAgB,CAAC,GAAGsB,IAAAA,iDAAwB;QAClD;QACA,IAAI,CAACL,GAAG,CAACd,0CAAiB,CAAC,EAAE;YAC3Bc,GAAG,CAACd,0CAAiB,CAAC,GAAGoB,IAAAA,0CAAiB;QAC5C;QACA,IAAI,CAACN,GAAG,CAACnB,0CAAiB,CAAC,EAAE;YAC3BmB,GAAG,CAACnB,0CAAiB,CAAC,GAAG0B,IAAAA,iDAAwB;QACnD,OAAO;YAELP,GAAG,CAACnB,0CAAiB,CAAC,GAAG;gBACvB2B,eAAeR,GAAG,CAACnB,0CAAiB,CAAC,CAAC2B,aAAa;gBACnDC,eAAeT,GAAG,CAACnB,0CAAiB,CAAC,CAAC4B,aAAa;gBACnDC,cAAcV,GAAG,CAACnB,0CAAiB,CAAC,CAAC6B,YAAY;gBACjDC,2BAA2BX,GAAG,CAACnB,0CAAiB,CAAC,CAAC8B,yBAAyB;gBAC3EC,8BAA8BZ,GAAG,CAACnB,0CAAiB,CAAC,CAAC+B,4BAA4B;gBACjFC,0BAA0Bb,GAAG,CAACnB,0CAAiB,CAAC,CAACgC,wBAAwB;YAC3E;QACF;QACA,IAAI,CAACb,GAAG,CAACc,8CAAqB,CAAC,EAAE;YAC/Bd,GAAG,CAACc,8CAAqB,CAAC,GAAGC,IAAAA,qDAA4B;QAC3D;QACA,IAAI,CAACf,GAAG,CAAChB,2CAAkB,CAAC,EAAE;YAC5BgB,GAAG,CAAChB,2CAAkB,CAAC,GAAGgC,IAAAA,mDAA0B;QACtD;QAEA,OAAOjB;IACT;IAEA,MAAMkB,uBAAuBC,WAAwC,EAAE;QACrE,MAAMC,iBAAiB,MAAMC,IAAAA,yBAAa,EAACF,aAAaG,uDAA4B;QAEpF,MAAMC,cAAc,MAAM,IAAI,CAACnC,WAAW;QAC1CmC,WAAW,CAACrC,mDAA0B,CAAC,GAAGsC,OAAOC,MAAM,CAACF,WAAW,CAACrC,mDAA0B,CAAC,EAAEkC;QACjG,OAAO9B,gBAAQ,CAACM,gBAAgB,CAAC;YAAEC,KAAK0B,YAAYzB,EAAE;QAAC,GAAGyB,aAAa;YACrExB,KAAK;QACP;IACF;IAEA,MAAM2B,oBAAoBP,WAAqC,EAAE;QAC/D,MAAMC,iBAAiB,MAAMC,IAAAA,yBAAa,EAACF,aAAaQ,4CAAiB;QAEzE,MAAMJ,cAAc,MAAM,IAAI,CAACnC,WAAW;QAC1CmC,WAAW,CAACvC,yCAAgB,CAAC,GAAGwC,OAAOC,MAAM,CAACF,WAAW,CAACvC,yCAAgB,CAAC,EAAEoC;QAC7E,OAAO9B,gBAAQ,CAACM,gBAAgB,CAAC;YAAEC,KAAK0B,YAAYzB,EAAE;QAAC,GAAGyB,aAAa;YACrExB,KAAK;QACP;IACF;IAEA,MAAM6B,uBAAuBT,WAA8B,EAAE;QAC3D,MAAMC,iBAAiB,MAAMC,IAAAA,yBAAa,EAACF,aAAaU,sDAA2B;QAEnF,MAAMN,cAAc,MAAM,IAAI,CAACnC,WAAW;QAC1C,MAAM0C,mBAAmBP,WAAW,CAACtC,2CAAkB,CAAC;QACxDuC,OAAOC,MAAM,CAACK,kBAAkBV;QAChC,OAAO9B,gBAAQ,CAACM,gBAAgB,CAAC;YAAEC,KAAK0B,YAAYzB,EAAE;QAAC,GAAGyB,aAAa;YACrExB,KAAK;QACP;IACF;IAEA,MAAMgC,wBAAwBZ,WAAyC,EAAE;QACvE,MAAMC,iBAAiB,MAAMC,IAAAA,yBAAa,EAACF,aAAaa,sDAA2B;QAEnF,MAAMT,cAAc,MAAM,IAAI,CAACnC,WAAW;QAC1C,MAAM6C,qBAAqBV,WAAW,CAACR,8CAAqB,CAAC;QAC7DS,OAAOC,MAAM,CAACQ,oBAAoBb;QAClC,OAAO9B,gBAAQ,CAACM,gBAAgB,CAAC;YAAEC,KAAK0B,YAAYzB,EAAE;QAAC,GAAGyB,aAAa;YACrExB,KAAK;QACP;IACF;IAEA,MAAMmC,oBAAoBf,WAAqC,EAAE;QAC/D,MAAMC,iBAAiB,MAAMC,IAAAA,yBAAa,EAACF,aAAagB,oDAAyB;QAEjF,MAAMZ,cAAc,MAAM,IAAI,CAACnC,WAAW;QAC1C,MAAMgD,iBAAiBb,WAAW,CAACzC,0CAAiB,CAAC;QACrD0C,OAAOC,MAAM,CAACW,gBAAgBhB;QAC9B,OAAO9B,gBAAQ,CAACM,gBAAgB,CAAC;YAAEC,KAAK0B,YAAYzB,EAAE;QAAC,GAAGyB,aAAa;YACrExB,KAAK;QACP;IACF;IAEA,MAAMsC,sBAAsBlB,WAAsC,EAAE;QAClE,MAAMC,iBAAiB,MAAMC,IAAAA,yBAAa,EAACF,aAAamB,qDAA0B;QAElF,MAAMf,cAAc,MAAM,IAAI,CAACnC,WAAW;QAC1C,MAAMmD,kBAAkBhB,WAAW,CAACpC,0CAAiB,CAAC;QACtDqC,OAAOC,MAAM,CAACc,iBAAiBnB;QAC/B,OAAO9B,gBAAQ,CAACM,gBAAgB,CAAC;YAAEC,KAAK0B,YAAYzB,EAAE;QAAC,GAAGyB,aAAa;YACrExB,KAAK;QACP;IACF;AACF"}
@@ -190,7 +190,8 @@ class OctoprintWebsocketAdapter extends _websocketadapter.WebsocketAdapter {
190
190
  async updateCurrentStateSafely() {
191
191
  try {
192
192
  const current = await this.octoprintClient.getPrinterCurrent(this.login, true);
193
- const job = await this.octoprintClient.getJob(this.login);
193
+ const isOperational = current.data?.state?.flags?.operational;
194
+ const job = isOperational ? await this.octoprintClient.getJob(this.login) : {};
194
195
  this.setApiState(_apistatetype.API_STATE.responding);
195
196
  return await this.emitEvent("current", {
196
197
  ...current.data,
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/services/octoprint/octoprint-websocket.adapter.ts"],"names":["OctoPrintMessage","OctoprintWebsocketAdapter","WsMessage","octoPrintEvent","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","connected","reauthRequired","current","history","event","plugin","timelapse","slicingProgress","WebsocketAdapter","printerType","octoprintClient","printerId","stateUpdated","stateUpdateTimestamp","socketState","SOCKET_STATE","unopened","apiStateUpdated","apiStateUpdateTimestamp","apiState","API_STATE","unset","lastMessageReceivedTimestamp","reauthRequiredTimestamp","login","logger","eventEmitter","configService","socketURL","sessionDto","username","refreshPrinterCurrentInterval","constructor","loggerFactory","eventEmitter2","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","isApiOnline","responding","closed","error","needsSetup","needsReauth","isClosedOrAborted","aborted","registerCredentials","socketLogin","loginDto","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","pathname","open","socket","Error","close","clearInterval","sendThrottle","throttle","defaultSocketThrottleRate","sendMessage","JSON","stringify","reauthSession","log","setupSocketSession","sendAuth","resetReauthRequired","resetSocketState","then","d","r","data","setApiState","setSocketState","ExternalServiceError","needs","group","warn","catch","e","response","status","getAdminUserOrDefault","HttpStatusCode","FORBIDDEN","BAD_GATEWAY","NOT_IMPLEMENTED","SERVICE_UNAVAILABLE","GATEWAY_TIMEOUT","includes","updateCurrentStateSafely","setInterval","getPrinterCurrent","job","getJob","emitEvent","progress","isAxiosError","castError","state","flags","operational","text","noResponse","setReauthRequired","Date","now","emitEventSync","payload","emit","OctoprintType","afterOpened","_","onMessage","message","authenticated","parse","eventName","Object","keys","substring","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","writeFileSync","afterClosed","onError","length","emitAsync","authenticating","auth","session","globalKey"],"mappings":"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"}
1
+ {"version":3,"sources":["../../../src/services/octoprint/octoprint-websocket.adapter.ts"],"names":["OctoPrintMessage","OctoprintWebsocketAdapter","WsMessage","octoPrintEvent","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","connected","reauthRequired","current","history","event","plugin","timelapse","slicingProgress","WebsocketAdapter","printerType","octoprintClient","printerId","stateUpdated","stateUpdateTimestamp","socketState","SOCKET_STATE","unopened","apiStateUpdated","apiStateUpdateTimestamp","apiState","API_STATE","unset","lastMessageReceivedTimestamp","reauthRequiredTimestamp","login","logger","eventEmitter","configService","socketURL","sessionDto","username","refreshPrinterCurrentInterval","constructor","loggerFactory","eventEmitter2","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","isApiOnline","responding","closed","error","needsSetup","needsReauth","isClosedOrAborted","aborted","registerCredentials","socketLogin","loginDto","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","pathname","open","socket","Error","close","clearInterval","sendThrottle","throttle","defaultSocketThrottleRate","sendMessage","JSON","stringify","reauthSession","log","setupSocketSession","sendAuth","resetReauthRequired","resetSocketState","then","d","r","data","setApiState","setSocketState","ExternalServiceError","needs","group","warn","catch","e","response","status","getAdminUserOrDefault","HttpStatusCode","FORBIDDEN","BAD_GATEWAY","NOT_IMPLEMENTED","SERVICE_UNAVAILABLE","GATEWAY_TIMEOUT","includes","updateCurrentStateSafely","setInterval","getPrinterCurrent","isOperational","state","flags","operational","job","getJob","emitEvent","progress","isAxiosError","castError","text","noResponse","setReauthRequired","Date","now","emitEventSync","payload","emit","OctoprintType","afterOpened","_","onMessage","message","authenticated","parse","eventName","Object","keys","substring","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","writeFileSync","afterClosed","onError","length","emitAsync","authenticating","auth","session","globalKey"],"mappings":"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"}
@@ -12,10 +12,6 @@ const _entities = require("../../entities");
12
12
  const _serversettingsconstants = require("../../constants/server-settings.constants");
13
13
  const _baseservice = require("./base.service");
14
14
  const _settingsdto = require("../interfaces/settings.dto");
15
- const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
16
- const _serverconstants = require("../../server.constants");
17
- const _validators = require("../../handlers/validators");
18
- const _settingsservicevalidation = require("../validators/settings-service.validation");
19
15
  class SettingsService2 extends (0, _baseservice.BaseService)(_entities.Settings, _settingsdto.SettingsDto) {
20
16
  configService;
21
17
  constructor({ configService, typeormService }){
@@ -140,16 +136,19 @@ class SettingsService2 extends (0, _baseservice.BaseService)(_entities.Settings,
140
136
  }
141
137
  if (!entity[_serversettingsconstants.serverSettingsKey]) {
142
138
  entity[_serversettingsconstants.serverSettingsKey] = (0, _serversettingsconstants.getDefaultServerSettings)();
139
+ } else {
140
+ entity[_serversettingsconstants.serverSettingsKey] = {
141
+ debugSettings: entity[_serversettingsconstants.serverSettingsKey].debugSettings,
142
+ loginRequired: entity[_serversettingsconstants.serverSettingsKey].loginRequired,
143
+ registration: entity[_serversettingsconstants.serverSettingsKey].registration,
144
+ experimentalClientSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalClientSupport,
145
+ experimentalMoonrakerSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
146
+ sentryDiagnosticsEnabled: entity[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled
147
+ };
143
148
  }
144
149
  if (!entity[_serversettingsconstants.credentialSettingsKey]) {
145
150
  entity[_serversettingsconstants.credentialSettingsKey] = (0, _serversettingsconstants.getDefaultCredentialSettings)();
146
151
  }
147
- if (!this.isWhiteListSettingEnabled()) {
148
- entity.server.whitelistEnabled = false;
149
- entity.server.whitelistedIpAddresses = (0, _serversettingsconstants.getDefaultWhitelistIpAddresses)();
150
- } else if (!entity.server.whitelistedIpAddresses?.length) {
151
- entity.server.whitelistedIpAddresses = (0, _serversettingsconstants.getDefaultWhitelistIpAddresses)();
152
- }
153
152
  if (!entity[_serversettingsconstants.frontendSettingKey]) {
154
153
  entity[_serversettingsconstants.frontendSettingKey] = (0, _serversettingsconstants.getDefaultFrontendSettings)();
155
154
  }
@@ -195,23 +194,6 @@ class SettingsService2 extends (0, _baseservice.BaseService)(_entities.Settings,
195
194
  await this.update(entity.id, entity);
196
195
  return entity;
197
196
  }
198
- async setWhitelist(enabled, ipAddresses) {
199
- if (!this.isWhiteListSettingEnabled()) {
200
- throw new _runtimeexceptions.BadRequestException("Whitelist settings are not enabled");
201
- }
202
- await (0, _validators.validateInput)({
203
- whitelistEnabled: enabled,
204
- whitelistedIpAddresses: ipAddresses
205
- }, _settingsservicevalidation.whitelistSettingUpdateRules);
206
- const entity = await this.getOrCreate();
207
- entity[_serversettingsconstants.serverSettingsKey].whitelistEnabled = enabled;
208
- entity[_serversettingsconstants.serverSettingsKey].whitelistedIpAddresses = ipAddresses;
209
- await this.update(entity.id, entity);
210
- return entity;
211
- }
212
- isWhiteListSettingEnabled() {
213
- return this.configService.get(_serverconstants.AppConstants.ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS, "false") === "true";
214
- }
215
197
  }
216
198
 
217
199
  //# sourceMappingURL=settings.service.js.map
@@ -1 +1 @@
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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"}
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","debugSettings","loginRequired","registration","experimentalClientSupport","experimentalMoonrakerSupport","sentryDiagnosticsEnabled","patchCredentialSettings","patchUpdate","newCredentialSettings","patchFileCleanSettings","newFileCleanSettings","setLoginRequired","enabled","setRegistrationEnabled","setSentryDiagnosticsEnabled"],"mappings":"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"}
@@ -33,25 +33,19 @@ _export(exports, {
33
33
  timeoutSettingsUpdateRules: function() {
34
34
  return timeoutSettingsUpdateRules;
35
35
  },
36
- whitelistSettingUpdateRules: function() {
37
- return whitelistSettingUpdateRules;
38
- },
39
36
  wizardUpdateRules: function() {
40
37
  return wizardUpdateRules;
41
38
  }
42
39
  });
43
40
  const _envutils = require("../../utils/env.utils");
44
- const serverSettingsUpdateRules = (whitelistFeatureEnabled)=>({
45
- registration: "boolean",
46
- loginRequired: "boolean",
47
- debugSettings: "object",
48
- "debugSettings.debugSocketEvents": "boolean",
49
- "debugSettings.debugSocketReconnect": "boolean",
50
- whitelistEnabled: whitelistFeatureEnabled ? "boolean" : "not",
51
- whitelistedIpAddresses: whitelistFeatureEnabled ? "array|minLength:1" : "not",
52
- "whitelistedIpAddresses.*": whitelistFeatureEnabled ? "required|string" : "not",
53
- experimentalMoonrakerSupport: "boolean"
54
- });
41
+ const serverSettingsUpdateRules = {
42
+ registration: "boolean",
43
+ loginRequired: "boolean",
44
+ debugSettings: "object",
45
+ "debugSettings.debugSocketEvents": "boolean",
46
+ "debugSettings.debugSocketReconnect": "boolean",
47
+ experimentalMoonrakerSupport: "boolean"
48
+ };
55
49
  const timeoutSettingsUpdateRules = {
56
50
  apiTimeout: "integer|min:1000"
57
51
  };
@@ -66,11 +60,6 @@ const credentialSettingPatchRules = {
66
60
  refreshTokenAttempts: "integer|min:-1",
67
61
  refreshTokenExpiry: (0, _envutils.isProductionEnvironment)() ? "integer|min:240" : "integer|min:0"
68
62
  };
69
- const whitelistSettingUpdateRules = {
70
- whitelistedIpAddresses: "required|array|minLength:1",
71
- "whitelistedIpAddresses.*": "required|string",
72
- whitelistEnabled: "required|boolean"
73
- };
74
63
  const wizardUpdateRules = {
75
64
  wizardCompleted: "required|boolean",
76
65
  wizardCompletedAt: "required|date|nullable",
@@ -1 +1 @@
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"}
1
+ {"version":3,"sources":["../../../src/services/validators/settings-service.validation.ts"],"names":["clientNextRules","credentialSettingPatchRules","fileCleanSettingsUpdateRules","frontendSettingsUpdateRules","moonrakerSupportRules","sentryDiagnosticsEnabledRules","serverSettingsUpdateRules","timeoutSettingsUpdateRules","wizardUpdateRules","registration","loginRequired","debugSettings","experimentalMoonrakerSupport","apiTimeout","gridCols","gridRows","largeTiles","jwtSecret","jwtExpiresIn","isProductionEnvironment","refreshTokenAttempts","refreshTokenExpiry","wizardCompleted","wizardCompletedAt","wizardVersion","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","enabled"],"mappings":";;;;;;;;;;;IAgDaA,eAAe;eAAfA;;IA3BAC,2BAA2B;eAA3BA;;IAaAC,4BAA4B;eAA5BA;;IAnBAC,2BAA2B;eAA3BA;;IA6BAC,qBAAqB;eAArBA;;IAJAC,6BAA6B;eAA7BA;;IAtCAC,yBAAyB;eAAzBA;;IASAC,0BAA0B;eAA1BA;;IAiBAC,iBAAiB;eAAjBA;;;0BA5B2B;AAEjC,MAAMF,4BAA4B;IACvCG,cAAc;IACdC,eAAe;IACfC,eAAe;IACf,mCAAmC;IACnC,sCAAsC;IACtCC,8BAA8B;AAChC;AAEO,MAAML,6BAA6B;IACxCM,YAAY;AACd;AAEO,MAAMV,8BAA8B;IACzCW,UAAU;IACVC,UAAU;IACVC,YAAY;AACd;AAEO,MAAMf,8BAA8B;IACzCgB,WAAW;IACXC,cAAcC,IAAAA,iCAAuB,MAAK,6BAA6B;IACvEC,sBAAsB;IACtBC,oBAAoBF,IAAAA,iCAAuB,MAAK,oBAAoB;AACtE;AAEO,MAAMX,oBAAoB;IAC/Bc,iBAAiB;IACjBC,mBAAmB;IACnBC,eAAe;AACjB;AAEO,MAAMtB,+BAA+B;IAC1CuB,gCAAgC;IAChCC,0BAA0B;IAC1BC,iCAAiC;AACnC;AAEO,MAAMtB,gCAAgC;IAC3CuB,SAAS;AACX;AAEO,MAAMxB,wBAAwB;IACnCwB,SAAS;AACX;AAEO,MAAM5B,kBAAkB;IAC7B4B,SAAS;AACX"}
@@ -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","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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"}
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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"}
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/state/printer.cache.ts"],"names":["PrinterCache","KeyDiffCache","printerService","eventEmitter2","constructor","on","printerEvents","batchPrinterCreated","handleBatchPrinterCreated","bind","printerCreated","handlePrinterCreatedOrUpdated","printerUpdated","printersDeleted","handlePrintersDeleted","loadCache","printerDocs","list","dtos","mapArray","keyValues","map","p","key","getId","value","setKeyValuesBatch","countDisabledPrinters","getAllValues","filter","enabled","length","listCachedPrinters","includeDisabled","printers","getCachedPrinterOrThrowAsync","id","printer","getValue","NotFoundException","getCachedPrinterOrThrow","keyValueStore","getNameAsync","name","getName","getLoginDtoAsync","printerURL","apiKey","printerType","getLoginDto","mappedPrinters","printerDto","setKeyValue","printerIds","deleteKeysBatch","toString","entities","entity","toUnsafeDto"],"mappings":"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"}
1
+ {"version":3,"sources":["../../src/state/printer.cache.ts"],"names":["PrinterCache","KeyDiffCache","printerService","eventEmitter2","constructor","on","printerEvents","batchPrinterCreated","handleBatchPrinterCreated","bind","printerCreated","handlePrinterCreatedOrUpdated","printerUpdated","printersDeleted","handlePrintersDeleted","loadCache","printerDocs","list","dtos","mapArray","keyValues","map","p","key","getId","value","setKeyValuesBatch","countDisabledPrinters","getAllValues","filter","enabled","length","listCachedPrinters","includeDisabled","printers","getCachedPrinterOrThrowAsync","id","printer","getValue","NotFoundException","getCachedPrinterOrThrow","keyValueStore","getNameAsync","name","getName","getLoginDtoAsync","printerURL","apiKey","printerType","getLoginDto","mappedPrinters","printerDto","setKeyValue","printerIds","deleteKeysBatch","toString","entities","entity","toUnsafeDto"],"mappings":";;;;+BAwBaA;;;eAAAA;;;8BAxByB;gCACR;mCACI;AAsB3B,MAAMA,qBAAqBC,0BAAY;IAC5CC,eAAgC;IAChCC,cAA6B;IAE7BC,YAAY,EAAEF,cAAc,EAAEC,aAAa,EAAqE,CAAE;QAChH,KAAK;QACL,IAAI,CAACD,cAAc,GAAGA;QACtB,IAAI,CAACC,aAAa,GAAGA;QAErB,IAAI,CAACA,aAAa,CAACE,EAAE,CAACC,6BAAa,CAACC,mBAAmB,EAAE,IAAI,CAACC,yBAAyB,CAACC,IAAI,CAAC,IAAI;QACjG,IAAI,CAACN,aAAa,CAACE,EAAE,CAACC,6BAAa,CAACI,cAAc,EAAE,IAAI,CAACC,6BAA6B,CAACF,IAAI,CAAC,IAAI;QAChG,IAAI,CAACN,aAAa,CAACE,EAAE,CAACC,6BAAa,CAACM,cAAc,EAAE,IAAI,CAACD,6BAA6B,CAACF,IAAI,CAAC,IAAI;QAChG,IAAI,CAACN,aAAa,CAACE,EAAE,CAACC,6BAAa,CAACO,eAAe,EAAE,IAAI,CAACC,qBAAqB,CAACL,IAAI,CAAC,IAAI;IAC3F;IAEA,MAAMM,YAAoC;QAExC,MAAMC,cAAc,MAAM,IAAI,CAACd,cAAc,CAACe,IAAI;QAClD,MAAMC,OAAO,IAAI,CAACC,QAAQ,CAACH;QAC3B,MAAMI,YAAYF,KAAKG,GAAG,CAAC,CAACC,IAAO,CAAA;gBAAEC,KAAK,IAAI,CAACC,KAAK,CAACF;gBAAIG,OAAOH;YAAE,CAAA;QAClE,MAAM,IAAI,CAACI,iBAAiB,CAACN,WAAW;QACxC,OAAOF;IACT;IAEA,MAAMS,wBAAwB;QAC5B,OAAO,AAAC,CAAA,MAAM,IAAI,CAACC,YAAY,EAAC,EAAGC,MAAM,CAAC,CAACP,IAAM,CAACA,EAAEQ,OAAO,EAAEC,MAAM;IACrE;IAEA,MAAMC,mBAAmBC,kBAAkB,KAAK,EAA4B;QAC1E,MAAMC,WAAW,MAAM,IAAI,CAACN,YAAY;QACxC,IAAI,CAACK,iBAAiB;YACpB,OAAOC,SAASL,MAAM,CAAC,CAACP,IAAMA,EAAEQ,OAAO;QACzC;QACA,OAAOI;IACT;IAEA,MAAMC,6BAA6BC,EAAW,EAAiC;QAC7E,MAAMC,UAAU,MAAM,IAAI,CAACC,QAAQ,CAACF;QACpC,IAAI,CAACC,SAAS;YACZ,MAAM,IAAIE,oCAAiB,CAAC,CAAC,kCAAkC,CAAC;QAClE;QACA,OAAOF;IACT;IAEAG,wBAAwBJ,EAAW,EAAE;QACnC,MAAMC,UAAU,IAAI,CAACI,aAAa,CAACL,GAAG;QACtC,IAAI,CAACC,SAAS;YACZ,MAAM,IAAIE,oCAAiB,CAAC,CAAC,kCAAkC,CAAC;QAClE;QACA,OAAOF;IACT;IAEA,MAAMK,aAAaN,EAAW,EAAE;QAC9B,MAAMC,UAAU,MAAM,IAAI,CAACF,4BAA4B,CAACC;QACxD,OAAOC,QAAQM,IAAI;IACrB;IAEAC,QAAQR,EAAW,EAAE;QACnB,MAAMC,UAAU,IAAI,CAACG,uBAAuB,CAACJ;QAC7C,OAAOC,QAAQM,IAAI;IACrB;IAEA,MAAME,iBAAiBT,EAAW,EAAE;QAClC,MAAMC,UAAU,MAAM,IAAI,CAACF,4BAA4B,CAACC;QACxD,OAAO;YACLU,YAAYT,QAAQS,UAAU;YAC9BC,QAAQV,QAAQU,MAAM;YACtBC,aAAaX,QAAQW,WAAW;QAClC;IACF;IAEAC,YAAYb,EAAW,EAAE;QACvB,MAAMC,UAAU,IAAI,CAACG,uBAAuB,CAACJ;QAC7C,OAAO;YACLU,YAAYT,QAAQS,UAAU;YAC9BC,QAAQV,QAAQU,MAAM;YACtBC,aAAaX,QAAQW,WAAW;QAClC;IACF;IAEA,MAAcxC,0BAA0B,EAAE0B,QAAQ,EAAE,EAAE;QACpD,MAAMgB,iBAAiB,IAAI,CAAC/B,QAAQ,CAACe;QACrC,MAAMd,YAAY8B,eAAe7B,GAAG,CAAC,CAACC,IAAO,CAAA;gBAAEC,KAAK,IAAI,CAACC,KAAK,CAACF;gBAAIG,OAAOH;YAAE,CAAA;QAC5E,MAAM,IAAI,CAACI,iBAAiB,CAACN,WAAW;IAC1C;IAEA,MAAcT,8BAA8B,EAAE0B,OAAO,EAAE,EAAE;QACvD,MAAMc,aAAa,IAAI,CAAC9B,GAAG,CAACgB;QAC5B,MAAM,IAAI,CAACe,WAAW,CAACD,WAAWf,EAAE,EAAEe,YAAY;IACpD;IAEA,MAAcrC,sBAAsB,EAAEuC,UAAU,EAA6B,EAAE;QAC7E,MAAM,IAAI,CAACC,eAAe,CAACD,YAAY;IACzC;IAEQ7B,MAAMC,KAAyB,EAAE;QACvC,OAAOA,MAAMW,EAAE,CAACmB,QAAQ;IAC1B;IAEQpC,SAASqC,QAAgC,EAAE;QACjD,OAAOA,SAASnC,GAAG,CAAC,CAACC;YACnB,OAAO,IAAI,CAACD,GAAG,CAACC;QAClB;IACF;IAEQD,IAAIoC,MAA0B,EAA4B;QAChE,OAAO,IAAI,CAACvD,cAAc,CAACwD,WAAW,CAACD;IACzC;AACF"}
@@ -52,8 +52,6 @@ class SettingsStore {
52
52
  },
53
53
  [_serversettingsconstants.serverSettingsKey]: {
54
54
  debugSettings: settings[_serversettingsconstants.serverSettingsKey].debugSettings,
55
- whitelistEnabled: settings[_serversettingsconstants.serverSettingsKey].whitelistEnabled,
56
- whitelistedIpAddresses: settings[_serversettingsconstants.serverSettingsKey].whitelistedIpAddresses,
57
55
  experimentalMoonrakerSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
58
56
  experimentalTypeormSupport: this.isTypeOrmMode,
59
57
  experimentalClientSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalClientSupport
@@ -137,13 +135,6 @@ class SettingsStore {
137
135
  });
138
136
  return this.getSettings();
139
137
  }
140
- async setWhitelist(whitelistEnabled = true, whitelistedIpAddresses) {
141
- this.settings = await this.settingsService.patchServerSettings({
142
- whitelistEnabled,
143
- whitelistedIpAddresses
144
- });
145
- return this.getSettings();
146
- }
147
138
  async updateServerSettings(serverSettings) {
148
139
  this.settings = await this.settingsService.patchServerSettings(serverSettings);
149
140
  return this.getSettings();
@@ -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","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":"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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","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","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":"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"}
@@ -17,6 +17,7 @@ const _errorutils = require("../utils/error.utils");
17
17
  const _node = require("@sentry/node");
18
18
  const _socketstatetype = require("../shared/dtos/socket-state.type");
19
19
  const _websocketconstants = require("../services/moonraker/constants/websocket.constants");
20
+ const _eventconstants = require("../constants/event.constants");
20
21
  class TestPrinterSocketStore {
21
22
  testSocket;
22
23
  socketIoGateway;
@@ -103,6 +104,11 @@ class TestPrinterSocketStore {
103
104
  if (this.testSocket) {
104
105
  this.testSocket.close();
105
106
  }
107
+ this.eventEmitter2.emit(_eventconstants.printerEvents.printersDeleted, {
108
+ printerIds: [
109
+ correlationToken
110
+ ]
111
+ });
106
112
  delete this.testSocket;
107
113
  testEvents.forEach((te)=>{
108
114
  this.eventEmitter2.off(te, listener);
@@ -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","protocol","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","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","protocol","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","emit","printerEvents","printersDeleted","printerIds","off"],"mappings":"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"}
@@ -75,6 +75,9 @@ class KeyDiffCache {
75
75
  if (!keyString?.length) {
76
76
  throw new Error("Key must be a non-empty serializable string");
77
77
  }
78
+ if (this.deletedKeys.includes(keyString)) {
79
+ return;
80
+ }
78
81
  this.keyValueStore[keyString] = value;
79
82
  if (markUpdated) {
80
83
  this.markUpdated(keyString);
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/utils/cache/key-diff.cache.ts"],"names":["KeyDiffCache","deletedKeys","updatedKeys","keyValueStore","getAllValues","keys","Object","getValuesBatch","getAllKeyValues","getValue","key","keyString","toString","length","Error","processStateDiffs","updatedValues","resetDiffs","setKeyValuesBatch","keyValues","markUpdated","forEach","value","setKeyValue","map","batchMarkUpdated","deleteKeysBatch","markDeleted","deleteKeyValue","batchMarkDeleted","keyStrings","some","values","push","convertToKeyString","includes","splice","indexOf"],"mappings":"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"}
1
+ {"version":3,"sources":["../../../src/utils/cache/key-diff.cache.ts"],"names":["KeyDiffCache","deletedKeys","updatedKeys","keyValueStore","getAllValues","keys","Object","getValuesBatch","getAllKeyValues","getValue","key","keyString","toString","length","Error","processStateDiffs","updatedValues","resetDiffs","setKeyValuesBatch","keyValues","markUpdated","forEach","value","setKeyValue","map","batchMarkUpdated","deleteKeysBatch","markDeleted","deleteKeyValue","batchMarkDeleted","keyStrings","some","values","push","convertToKeyString","includes","splice","indexOf"],"mappings":"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"}