@fdm-monster/server 1.6.4 → 1.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.yarn/install-state.gz +0 -0
- package/README.md +3 -2
- package/RELEASE_NOTES.MD +43 -5
- package/dist/consoles/download-github-releases.js +50 -0
- package/dist/consoles/download-github-releases.js.map +1 -0
- package/dist/constants/event.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +9 -6
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/container.js +0 -2
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +0 -1
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/plugin-firmware-update.controller.js +117 -18
- package/dist/controllers/plugin-firmware-update.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +2 -3
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +6 -1
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +38 -2
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/validation/printer-controller.validation.js +4 -4
- package/dist/controllers/validation/printer-controller.validation.js.map +1 -1
- package/dist/entities/printer.entity.js +3 -1
- package/dist/entities/printer.entity.js.map +1 -1
- package/dist/entities/settings.entity.js +1 -1
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/handlers/cache-manager.js +2 -9
- package/dist/handlers/cache-manager.js.map +1 -1
- package/dist/middleware/printer.js +4 -1
- package/dist/middleware/printer.js.map +1 -1
- package/dist/models/Printer.js +1 -1
- package/dist/models/Printer.js.map +1 -1
- package/dist/models/Settings.js +12 -2
- package/dist/models/Settings.js.map +1 -1
- package/dist/server.constants.js +4 -2
- package/dist/server.constants.js.map +1 -1
- package/dist/server.host.js +16 -4
- package/dist/server.host.js.map +1 -1
- package/dist/services/core/batch-call.service.js +21 -32
- package/dist/services/core/batch-call.service.js.map +1 -1
- package/dist/services/core/client-bundle.service.js.map +1 -1
- package/dist/services/core/github.service.js.map +1 -1
- package/dist/services/core/server-release.service.js.map +1 -1
- package/dist/services/core/yaml.service.js +2 -1
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/interfaces/printer-file.dto.js +0 -29
- package/dist/services/interfaces/printer-file.dto.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js +1 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/mongoose/print-completion.shared.js.map +1 -1
- package/dist/services/mongoose/settings.service.js +14 -5
- package/dist/services/mongoose/settings.service.js.map +1 -1
- package/dist/services/moonraker/moonraker-websocket.adapter.js +5 -4
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
- package/dist/services/moonraker/moonraker.client.js +8 -2
- package/dist/services/moonraker/moonraker.client.js.map +1 -1
- package/dist/services/moonraker.api.js +31 -1
- package/dist/services/moonraker.api.js.map +1 -1
- package/dist/services/octoprint/dto/octoprint-event.dto.js +1 -0
- package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
- package/dist/services/octoprint/dto/printer/current-printer-state.dto.js +6 -0
- package/dist/services/octoprint/dto/printer/current-printer-state.dto.js.map +1 -0
- package/dist/services/octoprint/octoprint-api.routes.js +1 -1
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-websocket.adapter.js +9 -2
- package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
- package/dist/services/octoprint/octoprint.client.js.map +1 -1
- package/dist/services/octoprint/plugin-base.service.js +5 -5
- package/dist/services/octoprint/plugin-base.service.js.map +1 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js +0 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js.map +1 -1
- package/dist/services/octoprint/utils/file.utils.js +0 -1
- package/dist/services/octoprint/utils/file.utils.js.map +1 -1
- package/dist/services/octoprint.api.js +20 -1
- package/dist/services/octoprint.api.js.map +1 -1
- package/dist/services/orm/settings.service.js +17 -8
- package/dist/services/orm/settings.service.js.map +1 -1
- package/dist/services/printer-api.factory.js +3 -1
- package/dist/services/printer-api.factory.js.map +1 -1
- package/dist/services/printer-api.interface.js +9 -0
- package/dist/services/printer-api.interface.js.map +1 -1
- package/dist/services/socket.factory.js +6 -1
- package/dist/services/socket.factory.js.map +1 -1
- package/dist/services/validators/printer-service.validation.js +4 -4
- package/dist/services/validators/printer-service.validation.js.map +1 -1
- package/dist/services/validators/settings-service.validation.js +14 -1
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +1 -1
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/services/websocket-adapter.interface.js +6 -0
- package/dist/services/websocket-adapter.interface.js.map +1 -0
- package/dist/state/printer-events.cache.js +12 -0
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/settings.store.js +26 -6
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +9 -2
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/state/validation/create-test-printer.validation.js +3 -1
- package/dist/state/validation/create-test-printer.validation.js.map +1 -1
- package/dist/tasks/printer-websocket-restore.task.js +4 -0
- package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
- package/dist/tasks.js.map +1 -1
- package/package.json +19 -17
- package/requests/moonraker/api_job.http +5 -0
- package/requests/moonraker/api_printer.http +5 -0
- package/requests/moonraker/api_settings.http +5 -0
- package/requests/moonraker/printer_info.http +5 -0
- package/requests/moonraker/printer_objects_list.http +6 -0
- package/requests/moonraker/printer_objects_pause_resume.http +6 -0
- package/requests/moonraker/printer_objects_print_stats.http +6 -0
- package/requests/moonraker/printer_objects_webhooks.http +6 -0
- package/requests/moonraker/server_info.http +5 -0
- package/requests/octoprint/octoprint-api-printer-current.http +7 -0
- package/requests/octoprint/octoprint-pluginmanager-plugins.http +7 -0
- package/tsconfig.json +2 -2
- package/dist/services/octoprint/dto/connection/connection-state.dto.js +0 -21
- package/dist/services/octoprint/dto/connection/connection-state.dto.js.map +0 -1
- package/dist/tasks/printer-state-update-poll.task.js +0 -65
- package/dist/tasks/printer-state-update-poll.task.js.map +0 -1
|
@@ -72,7 +72,6 @@ class OctoprintApi {
|
|
|
72
72
|
async getFiles() {
|
|
73
73
|
const files = await this.client.getLocalFiles(this.login, false);
|
|
74
74
|
return files.map((f)=>({
|
|
75
|
-
name: f.name,
|
|
76
75
|
path: f.path,
|
|
77
76
|
size: f.size,
|
|
78
77
|
date: f.date
|
|
@@ -93,6 +92,26 @@ class OctoprintApi {
|
|
|
93
92
|
async deleteFolder(path) {
|
|
94
93
|
await this.client.deleteFileOrFolder(this.login, path);
|
|
95
94
|
}
|
|
95
|
+
async getSettings() {
|
|
96
|
+
return await this.client.getSettings(this.login);
|
|
97
|
+
}
|
|
98
|
+
async getReprintState() {
|
|
99
|
+
const connected = await this.client.getConnection(this.login);
|
|
100
|
+
const connectionState = connected.current?.state;
|
|
101
|
+
const selectedJob = await this.client.getJob(this.login);
|
|
102
|
+
const currentJobFile = selectedJob?.job?.file;
|
|
103
|
+
if (!currentJobFile?.name) {
|
|
104
|
+
return {
|
|
105
|
+
connectionState,
|
|
106
|
+
reprintState: _printerapiinterface.ReprintState.NoLastPrint
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
return {
|
|
110
|
+
connectionState,
|
|
111
|
+
file: currentJobFile,
|
|
112
|
+
reprintState: _printerapiinterface.ReprintState.LastPrintReady
|
|
113
|
+
};
|
|
114
|
+
}
|
|
96
115
|
}
|
|
97
116
|
|
|
98
117
|
//# sourceMappingURL=octoprint.api.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/octoprint.api.ts"],"names":["OctoprintApi","client","printerLogin","constructor","octoprintClient","type","OctoprintType","login","getVersion","result","getApiVersion","data","server","connect","sendConnectionCommand","connectCommand","disconnect","disconnectCommand","restartServer","postServerRestartCommand","restartHost","NotImplementedException","restartPrinterFirmware","startPrint","path","postSelectPrintFile","pausePrint","sendJobCommand","pauseJobCommand","resumePrint","resumeJobCommand","cancelPrint","cancelJobCommand","sendGcode","script","sendCustomGCodeCommand","quickStop","movePrintHead","amounts","sendPrintHeadJogCommand","homeAxes","axes","sendPrintHeadHomeCommand","getFiles","files","getLocalFiles","map","f","
|
|
1
|
+
{"version":3,"sources":["../../src/services/octoprint.api.ts"],"names":["OctoprintApi","client","printerLogin","constructor","octoprintClient","type","OctoprintType","login","getVersion","result","getApiVersion","data","server","connect","sendConnectionCommand","connectCommand","disconnect","disconnectCommand","restartServer","postServerRestartCommand","restartHost","NotImplementedException","restartPrinterFirmware","startPrint","path","postSelectPrintFile","pausePrint","sendJobCommand","pauseJobCommand","resumePrint","resumeJobCommand","cancelPrint","cancelJobCommand","sendGcode","script","sendCustomGCodeCommand","quickStop","movePrintHead","amounts","sendPrintHeadJogCommand","homeAxes","axes","sendPrintHeadHomeCommand","getFiles","files","getLocalFiles","map","f","size","date","downloadFile","uploadFile","fileOrBuffer","uploadToken","uploadFileAsMultiPart","select","print","deleteFile","deleteFileOrFolder","deleteFolder","getSettings","getReprintState","connected","getConnection","connectionState","current","state","selectedJob","getJob","currentJobFile","job","file","name","reprintState","ReprintState","NoLastPrint","LastPrintReady"],"mappings":"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"}
|
|
@@ -26,9 +26,12 @@ class SettingsService2 extends (0, _baseservice.BaseService)(_entities.Settings,
|
|
|
26
26
|
}
|
|
27
27
|
toDto(entity) {
|
|
28
28
|
return {
|
|
29
|
-
[_serversettingsconstants.serverSettingsKey]:
|
|
29
|
+
[_serversettingsconstants.serverSettingsKey]: {
|
|
30
|
+
...entity[_serversettingsconstants.serverSettingsKey],
|
|
31
|
+
experimentalTypeormSupport: true
|
|
32
|
+
},
|
|
30
33
|
[_serversettingsconstants.frontendSettingKey]: entity[_serversettingsconstants.frontendSettingKey],
|
|
31
|
-
[_serversettingsconstants.
|
|
34
|
+
[_serversettingsconstants.printerFileCleanSettingKey]: entity[_serversettingsconstants.printerFileCleanSettingKey],
|
|
32
35
|
[_serversettingsconstants.wizardSettingKey]: entity[_serversettingsconstants.wizardSettingKey],
|
|
33
36
|
[_serversettingsconstants.timeoutSettingKey]: entity[_serversettingsconstants.timeoutSettingKey]
|
|
34
37
|
};
|
|
@@ -40,7 +43,7 @@ class SettingsService2 extends (0, _baseservice.BaseService)(_entities.Settings,
|
|
|
40
43
|
[_serversettingsconstants.serverSettingsKey]: (0, _serversettingsconstants.getDefaultServerSettings)(),
|
|
41
44
|
[_serversettingsconstants.credentialSettingsKey]: (0, _serversettingsconstants.getDefaultCredentialSettings)(),
|
|
42
45
|
[_serversettingsconstants.wizardSettingKey]: (0, _serversettingsconstants.getDefaultWizardSettings)(),
|
|
43
|
-
[_serversettingsconstants.
|
|
46
|
+
[_serversettingsconstants.printerFileCleanSettingKey]: (0, _serversettingsconstants.getDefaultFileCleanSettings)(),
|
|
44
47
|
[_serversettingsconstants.frontendSettingKey]: (0, _serversettingsconstants.getDefaultFrontendSettings)(),
|
|
45
48
|
[_serversettingsconstants.timeoutSettingKey]: (0, _serversettingsconstants.getDefaultTimeout)()
|
|
46
49
|
});
|
|
@@ -79,7 +82,7 @@ class SettingsService2 extends (0, _baseservice.BaseService)(_entities.Settings,
|
|
|
79
82
|
}
|
|
80
83
|
async updateFileCleanSettings(fileCleanSettings) {
|
|
81
84
|
const entity = await this.getOrCreate();
|
|
82
|
-
entity[_serversettingsconstants.
|
|
85
|
+
entity[_serversettingsconstants.printerFileCleanSettingKey] = fileCleanSettings;
|
|
83
86
|
await this.update(entity.id, entity);
|
|
84
87
|
return entity;
|
|
85
88
|
}
|
|
@@ -120,8 +123,14 @@ class SettingsService2 extends (0, _baseservice.BaseService)(_entities.Settings,
|
|
|
120
123
|
}
|
|
121
124
|
migrateSettingsRuntime(knownSettings) {
|
|
122
125
|
const entity = knownSettings;
|
|
123
|
-
if (!entity[_serversettingsconstants.
|
|
124
|
-
entity[_serversettingsconstants.
|
|
126
|
+
if (!entity[_serversettingsconstants.printerFileCleanSettingKey]) {
|
|
127
|
+
entity[_serversettingsconstants.printerFileCleanSettingKey] = (0, _serversettingsconstants.getDefaultFileCleanSettings)();
|
|
128
|
+
} else {
|
|
129
|
+
entity[_serversettingsconstants.printerFileCleanSettingKey] = {
|
|
130
|
+
autoRemoveOldFilesBeforeUpload: entity[_serversettingsconstants.printerFileCleanSettingKey].autoRemoveOldFilesBeforeUpload,
|
|
131
|
+
autoRemoveOldFilesAtBoot: entity[_serversettingsconstants.printerFileCleanSettingKey].autoRemoveOldFilesBeforeUpload,
|
|
132
|
+
autoRemoveOldFilesCriteriumDays: entity[_serversettingsconstants.printerFileCleanSettingKey].autoRemoveOldFilesCriteriumDays
|
|
133
|
+
};
|
|
125
134
|
}
|
|
126
135
|
if (!entity[_serversettingsconstants.wizardSettingKey]) {
|
|
127
136
|
entity[_serversettingsconstants.wizardSettingKey] = (0, _serversettingsconstants.getDefaultWizardSettings)();
|
|
@@ -159,11 +168,11 @@ class SettingsService2 extends (0, _baseservice.BaseService)(_entities.Settings,
|
|
|
159
168
|
}
|
|
160
169
|
async patchFileCleanSettings(patchUpdate) {
|
|
161
170
|
const entity = await this.getOrCreate();
|
|
162
|
-
if (!entity[_serversettingsconstants.
|
|
171
|
+
if (!entity[_serversettingsconstants.printerFileCleanSettingKey]) {
|
|
163
172
|
throw new Error("No existing wizard settings found, cant patch");
|
|
164
173
|
}
|
|
165
174
|
const newFileCleanSettings = {
|
|
166
|
-
...entity[_serversettingsconstants.
|
|
175
|
+
...entity[_serversettingsconstants.printerFileCleanSettingKey],
|
|
167
176
|
...patchUpdate
|
|
168
177
|
};
|
|
169
178
|
return await this.updateFileCleanSettings(newFileCleanSettings);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService2","BaseService","Settings","SettingsDto","configService","constructor","typeormService","toDto","entity","serverSettingsKey","frontendSettingKey","
|
|
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
|
|
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,
|
|
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"}
|
|
@@ -15,6 +15,9 @@ _export(exports, {
|
|
|
15
15
|
OctoprintType: function() {
|
|
16
16
|
return OctoprintType;
|
|
17
17
|
},
|
|
18
|
+
ReprintState: function() {
|
|
19
|
+
return ReprintState;
|
|
20
|
+
},
|
|
18
21
|
capabilities: function() {
|
|
19
22
|
return capabilities;
|
|
20
23
|
}
|
|
@@ -24,5 +27,11 @@ const MoonrakerType = 1;
|
|
|
24
27
|
const capabilities = {
|
|
25
28
|
startPrint: "startPrint"
|
|
26
29
|
};
|
|
30
|
+
var ReprintState = /*#__PURE__*/ function(ReprintState) {
|
|
31
|
+
ReprintState[ReprintState["PrinterNotAvailable"] = 0] = "PrinterNotAvailable";
|
|
32
|
+
ReprintState[ReprintState["NoLastPrint"] = 1] = "NoLastPrint";
|
|
33
|
+
ReprintState[ReprintState["LastPrintReady"] = 2] = "LastPrintReady";
|
|
34
|
+
return ReprintState;
|
|
35
|
+
}({});
|
|
27
36
|
|
|
28
37
|
//# sourceMappingURL=printer-api.interface.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/printer-api.interface.ts"],"names":["MoonrakerType","OctoprintType","capabilities","startPrint"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../src/services/printer-api.interface.ts"],"names":["MoonrakerType","OctoprintType","ReprintState","capabilities","startPrint"],"mappings":";;;;;;;;;;;IAQaA,aAAa;eAAbA;;IADAC,aAAa;eAAbA;;IA2BDC,YAAY;eAAZA;;IAPCC,YAAY;eAAZA;;;AApBN,MAAMF,gBAAgB;AACtB,MAAMD,gBAAgB;AAmBtB,MAAMG,eAAe;IAE1BC,YAAY;AACd;AAIO,IAAA,AAAKF,sCAAAA;;;;WAAAA"}
|
|
@@ -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
|
|
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","
|
|
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":";;;;+BAKaA;;;eAAAA;;;iCALY;qCACoB;AAItC,MAAMA;IACXC,OAAY;IAEZC,YAAYD,MAAU,CAAE;QACtB,IAAI,CAACA,MAAM,GAAGA;IAChB;IAEAE,eAAeC,WAAmB,EAAqB;QACrD,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"}
|
|
@@ -26,16 +26,16 @@ const _serviceconstants = require("../../constants/service.constants");
|
|
|
26
26
|
const _printerapiinterface = require("../printer-api.interface");
|
|
27
27
|
const createMongoPrinterRules = {
|
|
28
28
|
_id: "not",
|
|
29
|
-
apiKey: `required|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
|
|
30
29
|
printerURL: "required|httpurl",
|
|
31
|
-
printerType: `required|integer|in:${_printerapiinterface.OctoprintType}`,
|
|
30
|
+
printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
|
|
31
|
+
apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
|
|
32
32
|
enabled: "boolean",
|
|
33
33
|
name: "string"
|
|
34
34
|
};
|
|
35
35
|
const createPrinterRules = {
|
|
36
|
-
apiKey: `required|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
|
|
37
36
|
printerURL: "required|httpurl",
|
|
38
|
-
printerType: `required|integer|in:${_printerapiinterface.OctoprintType}`,
|
|
37
|
+
printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
|
|
38
|
+
apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
|
|
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","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createMongoPrinterRules","createPrinterRules","updatePrinterDisabledReasonRule","updatePrinterEnabledRule","_id","printerURL","printerType","OctoprintType","MoonrakerType","apiKey","UUID_LENGTH","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,YAAY;IACZC,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,QAAQ,CAAC,uBAAuB,EAAEF,kCAAa,CAAC,QAAQ,EAAEG,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACnGC,SAAS;IACTC,MAAM;AACR;AAEO,MAAMX,qBAAqB;IAChCI,YAAY;IACZC,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,QAAQ,CAAC,uBAAuB,EAAEF,kCAAa,CAAC,QAAQ,EAAEG,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACnGC,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":";;;;;;;;;;;
|
|
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;
|
|
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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/services/websocket-adapter.interface.ts"],"names":[],"mappings":""}
|
|
@@ -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":";;;;+
|
|
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":";;;;+BAgBaA;;;eAAAA;;;8BAhBgB;6BACJ;gCACK;AAcvB,MAAMA,2BAA2BC,0BAAY;IAC1CC,OAAsB;IACtBC,cAA6B;IAC7BC,cAA6B;IAErCC,YAAY,EACVF,aAAa,EACbG,aAAa,EACbF,aAAa,EAKd,CAAE;QACD,KAAK;QACL,IAAI,CAACA,aAAa,GAAGA;QACrB,IAAI,CAACF,MAAM,GAAGI,cAAcN,mBAAmBO,IAAI;QACnD,IAAI,CAACJ,aAAa,GAAGA;QAErB,IAAI,CAACK,iBAAiB;IACxB;IAEA,IAAYC,aAAa;QACvB,OAAO,IAAI,CAACL,aAAa,CAACM,oBAAoB,IAAIC,QAAQC,eAAeC;IAC3E;IAEA,MAAMC,0BAA0BC,EAAU,EAAE;QAC1C,MAAM,IAAI,CAACC,cAAc,CAACD,IAAI;IAChC;IAEA,MAAME,uBAAuBF,EAAU,EAAE;QACvC,OAAO,IAAI,CAACG,aAAa,CAACH,GAAG;IAC/B;IAEA,MAAMI,kBAAkBC,SAAiB,EAAE;QACzC,IAAIC,MAAM,MAAM,IAAI,CAACC,QAAQ,CAACF;QAC9B,IAAI,CAACC,KAAK;YACRA,MAAM;gBACJE,WAAW;gBACXC,gBAAgB;gBAEhBC,sBAAsB;gBACtBC,SAAS;gBACTC,SAAS;gBAITC,mBAAmB;gBACnBC,WAAW;gBACXC,UAAU;gBACVC,WAAW;gBACXC,kBAAkB;YACpB;YACA,MAAM,IAAI,CAACC,WAAW,CAACb,WAAWC;QACpC;QACA,OAAOA;IACT;IAEA,MAAMa,SAASd,SAAiB,EAAEe,KAAgB,EAAEC,OAAY,EAAE;QAChE,MAAMf,MAAM,MAAM,IAAI,CAACF,iBAAiB,CAACC;QACzCC,GAAG,CAACc,MAAM,GAAG;YACXC;YACAC,YAAYC,KAAKC,GAAG;QACtB;QACA,MAAM,IAAI,CAACN,WAAW,CAACb,WAAWC;IACpC;IAEA,MAAMmB,YAAYpB,SAAiB,EAAEe,KAAgB,EAAEM,YAAoB,EAAEL,OAAY,EAAE;QACzF,MAAMf,MAAM,MAAM,IAAI,CAACF,iBAAiB,CAACC;QACzC,IAAI,CAACC,GAAG,CAACc,MAAM,EAAE;YACfd,GAAG,CAACc,MAAM,GAAG,CAAC;QAChB;QACAd,GAAG,CAACc,MAAM,CAACM,aAAa,GAAG;YACzBL;YACAC,YAAYC,KAAKC,GAAG;QACtB;QACA,MAAM,IAAI,CAACN,WAAW,CAACb,WAAWC;IACpC;IAEA,MAAMqB,sBAAsB,EAAEC,UAAU,EAA4B,EAAE;QACpE,MAAM,IAAI,CAACC,eAAe,CAACD;IAC7B;IAEQnC,oBAAoB;QAC1B,IAAI,CAACL,aAAa,CAAC0C,EAAE,CAAC,eAAe,CAACC,IAAM,IAAI,CAACC,wBAAwB,CAACD;QAC1E,IAAI,CAAC3C,aAAa,CAAC0C,EAAE,CAAC,eAAe,CAACC,IAAM,IAAI,CAACE,wBAAwB,CAACF;QAC1E,IAAI,CAAC3C,aAAa,CAAC0C,EAAE,CAACI,6BAAa,CAACC,eAAe,EAAE,IAAI,CAACR,qBAAqB,CAACS,IAAI,CAAC,IAAI;IAC3F;IAEA,MAAcJ,yBAAyBD,CAAoB,EAAE;QAC3D,MAAM1B,YAAY0B,EAAE1B,SAAS;QAC7B,IAAI,CAAC;YAAC;YAAU;SAAQ,CAACgC,QAAQ,CAACN,EAAEO,KAAK,GAAG;YAC1C,MAAM,IAAI,CAACnB,QAAQ,CAACd,WAAW0B,EAAEO,KAAK,EAAEP,EAAEO,KAAK,KAAK,YAAY,IAAI,CAACC,mBAAmB,CAACR,EAAEV,OAAO,IAAIU,EAAEV,OAAO;YAE/G,IAAI,IAAI,CAAC3B,UAAU,EAAE;gBACnB,IAAI,CAACP,MAAM,CAACqD,GAAG,CAAC,CAAC,SAAS,EAAET,EAAEO,KAAK,CAAC,iBAAiB,EAAEG,IAAAA,qBAAQ,EAACV,EAAEV,OAAO,GAAG,EAAEU,EAAE1B,SAAS;YAC3F;QACF;IACF;IAEA,MAAc4B,yBACZF,CAA2F,EAC3F;QACA,MAAM1B,YAAY0B,EAAE1B,SAAS;QAC7B,MAAMqC,YAAYX,EAAEO,KAAK;QAGzB,IAAI;YAAC;YAAwB;SAAU,CAACD,QAAQ,CAACK,YAAY;YAC3D,MAAM,IAAI,CAACvB,QAAQ,CAACd,WAAWqC,WAAiDX,EAAEV,OAAO;QAC3F;IACF;IAEQkB,oBAAoBlB,OAA0B,EAAE;QACtD,OAAOA,QAAQsB,IAAI;QACnB,OAAOtB,QAAQuB,KAAK;QACpB,OAAOvB,QAAQwB,QAAQ;QACvB,OAAOxB;IACT;AACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/printer-socket.store.ts"],"names":["PrinterSocketStore","socketIoGateway","socketFactory","eventEmitter2","printerCache","printerSocketAdaptersById","logger","configService","settingsStore","constructor","loggerFactory","name","subscribeToEvents","getSocketStatesById","socketStatesById","Object","values","forEach","s","printerId","printerType","socket","socketState","api","apiState","loadPrinterSockets","loadCache","printerDocs","listCachedPrinters","doc","handlePrinterCreated","printer","e","captureException","error","errorSummary","log","keys","length","listPrinterSockets","reconnectOctoPrint","id","getPrinterSocket","close","resetSocketState","reconnectPrinterSockets","reauthRequested","socketSetupRequested","socketStates","apiStates","promisesReauth","failedSocketsReauth","OctoprintType","needsReauth","promise","reauthSession","catch","_","push","getDebugSettingsSensitive","debugSocketSetup","Promise","all","promisesOpenSocket","failedSocketReopened","needsSetup","needsReopen","setupSocketSession","then","open","keySocket","valSocket","keyApi","valApi","reauth","socketSetup","createOrUpdateSocket","enabled","foundAdapter","toString","deleteSocket","createInstance","registerCredentials","loginDto","apiKey","printerURL","protocol","handleBatchPrinterCreated","printers","p","handlePrinterUpdated","handlePrintersDeleted","printerIds","on","printerEvents","printerCreated","bind","printersDeleted","printerUpdated","batchPrinterCreated"],"mappings":";;;;+BAiBaA;;;eAAAA;;;sBAjBoB;4BACJ;gCACC;
|
|
1
|
+
{"version":3,"sources":["../../src/state/printer-socket.store.ts"],"names":["PrinterSocketStore","socketIoGateway","socketFactory","eventEmitter2","printerCache","printerSocketAdaptersById","logger","configService","settingsStore","constructor","loggerFactory","name","subscribeToEvents","getSocketStatesById","socketStatesById","Object","values","forEach","s","printerId","printerType","socket","socketState","api","apiState","loadPrinterSockets","loadCache","printerDocs","listCachedPrinters","doc","handlePrinterCreated","printer","e","captureException","error","errorSummary","log","keys","length","listPrinterSockets","reconnectOctoPrint","id","getPrinterSocket","close","resetSocketState","reconnectPrinterSockets","reauthRequested","socketSetupRequested","socketStates","apiStates","promisesReauth","failedSocketsReauth","OctoprintType","needsReauth","promise","reauthSession","catch","_","push","getDebugSettingsSensitive","debugSocketSetup","Promise","all","promisesOpenSocket","failedSocketReopened","needsSetup","needsReopen","setupSocketSession","then","open","keySocket","valSocket","keyApi","valApi","reauth","socketSetup","createOrUpdateSocket","enabled","foundAdapter","toString","deleteSocket","createInstance","registerCredentials","loginDto","apiKey","printerURL","protocol","handleBatchPrinterCreated","printers","p","handlePrinterUpdated","handlePrintersDeleted","printerIds","on","printerEvents","printerCreated","bind","printersDeleted","printerUpdated","batchPrinterCreated"],"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.
|
|
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.
|
|
112
|
+
return this.getSettings()[_serversettingsconstants.printerFileCleanSettingKey];
|
|
105
113
|
}
|
|
106
114
|
isPreUploadFileCleanEnabled() {
|
|
107
|
-
return this.getSettings()[_serversettingsconstants.
|
|
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","
|
|
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"}
|